cd6fed98de
Merge pull request #15208 from albers/daemon-completion-fixes
...
Fixes to bash completion for docker daemon
Upstream-commit: ce99a462f82f163afb486abb6804c7293f09324a
Component: engine
2015-07-31 11:56:11 -07:00
6739612157
Fix completion of commands after a global option with arg
...
Without this fix, `docker -l info ` would not complete the commands.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: aab82c5c2230fa328bfac3c156b482634a42b73c
Component: engine
2015-07-31 20:16:33 +02:00
fceb28a0c5
Add completion of global options to docker daemon
...
It's a bit confusing: the "global options" are valid as "global options"
for all client commands (i.e. all but daemon).
Example: `docker --log-level info run`
For `docker daemon`, these "global options" are only valid as "command
options".
Example: `docker daemon --log-level info`
As command completion cannot tell which command the user is going to
type next, completion for the daemon command has to allow illegal
syntaxes like
`docker --log-level info daemon --log-level info`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e0dad9a153fb8aad44cc36aa4bd14e297b5f120c
Component: engine
2015-07-31 20:06:45 +02:00
f32577e8c4
Merge pull request #15201 from moul/names-generator-bin
...
pkg/namesgenerator: add a 'names-generator' binary
Upstream-commit: 0659ceb0d0a27d23d727d8d8e3428f59aa039d37
Component: engine
2015-07-31 13:09:02 -04:00
da82af9892
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Upstream-commit: 9e9f3aa36b5286556c8f99557d8bcc66946598d3
Component: engine
2015-07-31 08:58:41 -07:00
f8cb968c76
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
Upstream-commit: 5276655b694bec1125c4c119adb941a2b7531433
Component: engine
2015-07-31 09:40:12 -04:00
2f7ecc6177
Merge pull request #15193 from jfrazelle/fix-lxc
...
fix lxc test machine
Upstream-commit: 1032202b88145478c2206873056497a03a758bb9
Component: engine
2015-07-31 09:13:52 -04:00
8b2de70434
Merge pull request #15191 from duglin/TlsTest
...
Add a test to make sure that --tlsverify=false turns on tls in daemon
Upstream-commit: 468bc7d819f37badde32fd6e45dae41149695a92
Component: engine
2015-07-31 08:54:35 -04:00
8a201393ad
pkg/namesgenerator: add a 'names-generator' binary
...
Signed-off-by: Manfred Touron <m@42.am >
Upstream-commit: 08006506651498cd8647123daadc7abde37ecb7d
Component: engine
2015-07-31 13:07:40 +02:00
e9bd79ecdf
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a5e2fa2b2e30cf515d22dee532ae33d5ab695008
Component: engine
2015-07-31 12:53:46 +08:00
4d212c22a0
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f12e18d7ef9b1a354c10038874f0e7be0a8bb66f
Component: engine
2015-07-30 21:30:47 -07:00
1d4ee6ca42
Add a test to make sure that --tlsverify=false turn on tls in daemon
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5ced3ab3236bfe8ade1b5b6663599518086af7da
Component: engine
2015-07-30 21:21:24 -07:00
0514f6080b
Merge pull request #15179 from Microsoft/10662-yetmoretodos
...
Windows: Tidy verifyContainerSettings
Upstream-commit: 500a314713b9c2382c77d1d57cab960ce94f3661
Component: engine
2015-07-30 23:58:16 -04:00
6d44ed4263
Merge pull request #15175 from MHBauer/cliconfig-lint
...
additional lint fix and enable linter for cliconfig package
Upstream-commit: b48d744b07c5894a7c958f99320ea8a8b608308a
Component: engine
2015-07-30 23:07:19 -04:00
c85fe1e185
Merge pull request #14970 from tiborvass/windows-registry-endpoint
...
registry: Change default endpoint on windows to a windows-specific one
Upstream-commit: ad96fc310b52b41463ecc52f0a03c2022866e867
Component: engine
2015-07-30 22:41:34 -04:00
935ca110b9
Merge pull request #15123 from ewindisch/seed-pkgrand-cryptorand
...
Prefer crypto rand seed for pkg/rand
Upstream-commit: 9a9a12b35168c3b4391139982bc613db2ff97834
Component: engine
2015-07-30 22:41:17 -04:00
385c38be8c
Merge pull request #15146 from kolyshkin/mkdirall
...
Simplify and fix MkdirAll usage
Upstream-commit: 8d2739df980a1af76ad50e5c423134815186b61c
Component: engine
2015-07-30 22:40:57 -04:00
69fe9b7219
Merge pull request #15186 from brahmaroutu/btrfs_test_failure
...
fix unit test breakage due to lint changes
Upstream-commit: 0b089bc7d5bc8c70bb18c45bb4b6615038d7f7cf
Component: engine
2015-07-30 22:39:40 -04:00
512f9525b2
Merge pull request #15190 from tiborvass/bump-distrib
...
Update distribution to fix uuid.Loggerf initialization logic
Upstream-commit: e49ab10556366c6911c4fcbc36ec8d6bcd08e6a7
Component: engine
2015-07-30 19:19:36 -07:00
61c2d57722
Use default no-op uuid.Loggerf for client cli
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 3face3c521127cb86570c68d5f2a8f55e7633146
Component: engine
2015-07-30 21:19:51 -04:00
b6aee824ae
Add missing LICENSE files for docker/notary
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 084af30f39ce4f00d2e3c379b8c5cc4f4d345ee0
Component: engine
2015-07-30 21:19:18 -04:00
0ed74d6e3a
Actually link to the information
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com >
Upstream-commit: d2cd142ce1da96589902d07fddf3a12e63631d78
Component: engine
2015-07-30 21:16:45 -04:00
36d21e417b
Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0cce1fb37ffbcb209826fdc98c3148fc5b1e2abd
Component: engine
2015-07-30 21:14:39 -04:00
40d1455b2e
Add test code to cover issue #14859
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4964ab08218f3b40f5c3a6bf19fe74f7fb39562a
Component: engine
2015-07-30 17:37:11 -07:00
3f5b1423ad
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 91274625ba43b5d059ac239bd3ca53006158b7a7
Component: engine
2015-07-30 17:28:40 -07:00
bdce5e6b99
fix unit test breakage due to lint changes
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 22873eae3153f93b55b3b09eff887a3bfdc8eb54
Component: engine
2015-07-31 00:22:28 +00:00
0a94a03fa6
Merge pull request #15184 from jfrazelle/fix-install
...
fix regression
Upstream-commit: ffeec2bdd1334fbef040e0536196f77feb156c73
Component: engine
2015-07-30 16:59:13 -07:00
ac2320f2b1
Merge pull request #15180 from tiborvass/fix-v1-mirror-fallback
...
registry: allow fallback on unknown errors
Upstream-commit: e2b2c2ae819890d123c4569f1167ad2faa491d58
Component: engine
2015-07-30 19:54:48 -04:00
9b3fa793ce
Merge pull request #15174 from Microsoft/10662-top
...
Windows: Top (non-)implementation
Upstream-commit: 044b56e94fcb1def77efda36a2cf60f97e82e866
Component: engine
2015-07-30 19:49:15 -04:00
d1ebdf9030
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b0af811272c7cf9d7694ab5a21ded776a46a7d7a
Component: engine
2015-07-30 16:38:51 -07:00
5a700e39a6
Merge pull request #15154 from stefanberger/apparmor-engine
...
contrib: Extend engine apparmor profile for tools needed by devicemapper
Upstream-commit: f8f4deb0b2c52d97322a9c66d05ee8d4d8a4d665
Component: engine
2015-07-30 19:22:28 -04:00
1c2351b5fa
Merge pull request #15103 from Djelibeybi/fix14924
...
Seperate lsb_dist detection from dist_version detection
Upstream-commit: 5b65284649c6cb614a40d6112096ac28a3488e75
Component: engine
2015-07-30 16:21:35 -07:00
b3ca0f119a
registry: allow fallback on unknown errors
...
This patch fixes a bug where a user specifies a v1 mirror for
--registry-mirror and pull an image from the Hub.
It used to not fallback because of an unexpected error returned when
trying to JSON marshal nginx output.
We now ensure that any unexpected error falls back to the next endpoint
in the list.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: a21ba12f4e7f11c17e6d665716f3060b9923b11c
Component: engine
2015-07-30 19:03:38 -04:00
6c86a6f59d
Windows: Address more todos
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3fea79bfd835960e3f6c9972305e350ee2e256b2
Component: engine
2015-07-30 15:28:11 -07:00
15e0190adc
Merge pull request #15176 from Microsoft/10662-removesometodos
...
Windows: Remove some TODOs
Upstream-commit: c1e2e4d9c69649e502a6099144763a75f5ea6212
Component: engine
2015-07-30 15:26:06 -07:00
c1a15a2b27
Merge pull request #14922 from rhatdan/netlabel
...
Label /etc/resolv.conf, /etc/hosts ... correctly in shared network co…
Upstream-commit: 86a6e4914f761188dd4495810d7901ced778f438
Component: engine
2015-07-30 15:03:49 -07:00
3da5dccbd9
Windows: Remove some TODOs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f50b916ca6cce410f3b1bbd5250fb9ba2a7942a6
Component: engine
2015-07-30 14:46:51 -07:00
58be23597e
lint fix and enable linter for cliconfig package
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: e809919e2645bc21f7b42fa97134065707f2d15f
Component: engine
2015-07-30 14:37:37 -07:00
15d762cf3c
Merge pull request #15106 from jgkamat/links
...
Fix a couple broken links
Upstream-commit: 5c9e5bfb0f9006f6c7ec98bc26cfd9f6889b459a
Component: engine
2015-07-30 17:28:11 -04:00
7209ad66b6
Windows: Top (non-)implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0a9ec21818151304654085fd86a4b2ed54925e9a
Component: engine
2015-07-30 14:25:15 -07:00
05325c6d3a
Merge pull request #15170 from runcom/i-like-cleaning
...
Remove HostConfig,SetHostConfig from daemon.container
Upstream-commit: 41d9270a40469a3226261285525c6696fd996bed
Component: engine
2015-07-30 17:23:58 -04:00
0c28668f97
Merge pull request #14950 from ottok/master
...
Multiple fixes to 'docker stats' output
Upstream-commit: 85051832522ca217401d6eb4ddda1b1a7fdce9ad
Component: engine
2015-07-30 14:02:35 -07:00
a55bf4a409
Merge pull request #14885 from jlhawn/fix_cp_symlink
...
Fix copying of symlinks in containers
Upstream-commit: 030f61df3db2c053d68aacddc2c6893db3dee6ce
Component: engine
2015-07-30 13:42:40 -07:00
2f014c412e
Merge pull request #15169 from Microsoft/10662-tidydiff
...
Tidy platform common bits in diff
Upstream-commit: 9431acbc0ab819ba3040b680e8ca05318c9c9156
Component: engine
2015-07-30 13:42:27 -07:00
12be4fa37a
Remove HostConfig,SetHostConfig from daemon.container
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f95333010e1c036ac33d75f5271af1f2b03a276e
Component: engine
2015-07-30 22:25:31 +02:00
7a72702c89
Tidy platform common bits in diff
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5ab9654bc4ebcf49f95c91e16ecb09bbe7779b50
Component: engine
2015-07-30 13:04:49 -07:00
c7e78a7a31
Merge pull request #14844 from WeiZhang555/golint-api
...
fix golint errors/warnings of pkg api/
Upstream-commit: 2f1a7c903f163b3d85c96683971aaad4a24585d7
Component: engine
2015-07-30 16:02:06 -04:00
af1a68305d
Merge pull request #15168 from Microsoft/10662-daemonconfiglocation
...
Windows: [TP3] Move daemon config directory
Upstream-commit: 75c082c4b208fbba6608e7a5ea4959885d122f5a
Component: engine
2015-07-30 12:56:52 -07:00
f32fe35a14
Merge pull request #15148 from hqhq/hq_golint_native
...
Add back golint for daemon/execdriver/native
Upstream-commit: 2d730c93b4010b314f5365b22810823201ea1d58
Component: engine
2015-07-30 15:51:06 -04:00
76d46c7e63
Windows: Move daemon config directory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ed4400baf21528644c608eeda24fda081dfc4f2
Component: engine
2015-07-30 12:39:19 -07:00
