git.proxmox.com Git - cargo.git/commit

]> git.proxmox.com Git - cargo.git/commit

projects / cargo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a9480ed 469af67)

author	Jonathan Claudius <jclaudius@mozilla.com>
	Fri, 22 Feb 2019 19:21:53 +0000 (14:21 -0500)
committer	GitHub <noreply@github.com>
	Fri, 22 Feb 2019 19:21:53 +0000 (14:21 -0500)
commit	46b2b787543d75591258bbb744e7cc2aba531fe2
tree	cf4b37ab6b9e623ed94f619566c4aa077132b67b	tree
parent	a9480edbc2aeeb4a547a83d0b18c7fa1132bb83e	commit \| diff
parent	469af67940e5fcd21ee6d7fe7c8e8ab049791fd2	commit \| diff

Merge branch 'master' into https_all_the_things

16 files changed:

src/bin/cargo/commands/pkgid.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/core/package_id_spec.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/cargo_package.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/common_for_install_and_uninstall.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/registry.rs	diff1 \|	diff2 \|	blob \| history
src/doc/man/cargo.adoc	diff1 \|	diff2 \|	blob \| history
src/doc/man/generated/cargo.html	diff1 \|	diff2 \|	blob \| history
src/doc/src/reference/manifest.md	diff1 \|	diff2 \|	blob \| history
src/etc/man/cargo.1	diff1 \|	diff2 \|	blob \| history
tests/testsuite/bad_config.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/build.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/build_auth.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/git.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/package.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/resolve.rs	diff1 \|	diff2 \|	blob \| history
tests/testsuite/support/resolver.rs	diff1 \|	diff2 \|	blob \| history

backport for Debian buster