Skip to content

Commit

Permalink
Update dependencies to remove duplicate rand versions (linkerd#170)
Browse files Browse the repository at this point in the history
This branch updates the proxy's dependencies to eliminate multiple
incompatible versions of the `rand` crate. 

Previously we depended on both `rand` 0.4.3 and 0.5.1. After this
branch, we depend on `rand` 0.6.3 (the latest) and 0.5.1. However, PR
linkerd#169 will also update `trust-dns-resolver` (the only crate depending on
`rand` 0.5.1) to a version that depends on `rand` 0.6.3, so once both
this branch and linkerd#169 are merged, we will depend only on `rand` 0.6.3.

Note that this is a fairly large change to `Cargo.toml` --- it was
necessary to update many of the proxy's dependencies in order to
consolidate on one `rand` version. Additionally, I had to push branches
of some of those dependencies in order to update their `rand`
dependency, so it's currently necessary to patch some of the proxy's
dependencies. When those branches merge upstream, the patches can be
removed.

Signed-off-by: Eliza Weisman <[email protected]>
  • Loading branch information
hawkw authored Feb 1, 2019
1 parent d3e7f8b commit 1fe4e38
Show file tree
Hide file tree
Showing 6 changed files with 246 additions and 140 deletions.
Loading

0 comments on commit 1fe4e38

Please sign in to comment.