3e0b0c59e6
Merge pull request #15207 from calavera/fix_index_locking
...
Remove read index that causes dead lock.
2015-07-31 14:55:00 -07:00
6fbacc6edb
Merge pull request #15005 from WeiZhang555/stats-block
...
Docker stats: display Block IO stats
2015-07-31 13:59:55 -07:00
5ed84009b3
Remove read index that causes dead lock.
...
Let the iterator to lock the index when it needs it.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-31 13:53:17 -07:00
72c04ab87c
Tidy volume*.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-31 13:13:40 -07:00
ce99a462f8
Merge pull request #15208 from albers/daemon-completion-fixes
...
Fixes to bash completion for docker daemon
2015-07-31 11:56:11 -07:00
aab82c5c22
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>
2015-07-31 20:16:33 +02:00
e0dad9a153
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>
2015-07-31 20:06:45 +02:00
0659ceb0d0
Merge pull request #15201 from moul/names-generator-bin
...
pkg/namesgenerator: add a 'names-generator' binary
2015-07-31 13:09:02 -04:00
9e9f3aa36b
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
2015-07-31 08:58:41 -07:00
5276655b69
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
2015-07-31 09:40:12 -04:00
6a4ac63aaa
Docker stats: display Block IO stats
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-07-31 21:26:32 +08:00
1032202b88
Merge pull request #15193 from jfrazelle/fix-lxc
...
fix lxc test machine
2015-07-31 09:13:52 -04:00
468bc7d819
Merge pull request #15191 from duglin/TlsTest
...
Add a test to make sure that --tlsverify=false turns on tls in daemon
2015-07-31 08:54:35 -04:00
0800650665
pkg/namesgenerator: add a 'names-generator' binary
...
Signed-off-by: Manfred Touron <m@42.am>
2015-07-31 13:07:40 +02:00
a5e2fa2b2e
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-31 12:53:46 +08:00
f12e18d7ef
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-30 21:30:47 -07:00
5ced3ab323
Add a test to make sure that --tlsverify=false turn on tls in daemon
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-30 21:21:24 -07:00
500a314713
Merge pull request #15179 from Microsoft/10662-yetmoretodos
...
Windows: Tidy verifyContainerSettings
2015-07-30 23:58:16 -04:00
b48d744b07
Merge pull request #15175 from MHBauer/cliconfig-lint
...
additional lint fix and enable linter for cliconfig package
2015-07-30 23:07:19 -04:00
ad96fc310b
Merge pull request #14970 from tiborvass/windows-registry-endpoint
...
registry: Change default endpoint on windows to a windows-specific one
2015-07-30 22:41:34 -04:00
9a9a12b351
Merge pull request #15123 from ewindisch/seed-pkgrand-cryptorand
...
Prefer crypto rand seed for pkg/rand
2015-07-30 22:41:17 -04:00
8d2739df98
Merge pull request #15146 from kolyshkin/mkdirall
...
Simplify and fix MkdirAll usage
2015-07-30 22:40:57 -04:00
0b089bc7d5
Merge pull request #15186 from brahmaroutu/btrfs_test_failure
...
fix unit test breakage due to lint changes
2015-07-30 22:39:40 -04:00
e49ab10556
Merge pull request #15190 from tiborvass/bump-distrib
...
Update distribution to fix uuid.Loggerf initialization logic
2015-07-30 19:19:36 -07:00
e496d40107
Merge pull request #15189 from jrabbit/fix-restart-policy-link
...
Docs: Actually link to restart policy information
2015-07-30 21:44:16 -04:00
3face3c521
Use default no-op uuid.Loggerf for client cli
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 21:19:51 -04:00
084af30f39
Add missing LICENSE files for docker/notary
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 21:19:18 -04:00
d2cd142ce1
Actually link to the information
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2015-07-30 21:16:45 -04:00
0cce1fb37f
Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 21:14:39 -04:00
4964ab0821
Add test code to cover issue #14859
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-30 17:37:11 -07:00
91274625ba
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-30 17:28:40 -07:00
22873eae31
fix unit test breakage due to lint changes
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-31 00:22:28 +00:00
ffeec2bdd1
Merge pull request #15184 from jfrazelle/fix-install
...
fix regression
2015-07-30 16:59:13 -07:00
e2b2c2ae81
Merge pull request #15180 from tiborvass/fix-v1-mirror-fallback
...
registry: allow fallback on unknown errors
2015-07-30 19:54:48 -04:00
044b56e94f
Merge pull request #15174 from Microsoft/10662-top
...
Windows: Top (non-)implementation
2015-07-30 19:49:15 -04:00
b0af811272
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-30 16:38:51 -07:00
f8f4deb0b2
Merge pull request #15154 from stefanberger/apparmor-engine
...
contrib: Extend engine apparmor profile for tools needed by devicemapper
2015-07-30 19:22:28 -04:00
5b65284649
Merge pull request #15103 from Djelibeybi/fix14924
...
Seperate lsb_dist detection from dist_version detection
2015-07-30 16:21:35 -07:00
a21ba12f4e
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>
2015-07-30 19:03:38 -04:00
3fea79bfd8
Windows: Address more todos
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-30 15:28:11 -07:00
c1e2e4d9c6
Merge pull request #15176 from Microsoft/10662-removesometodos
...
Windows: Remove some TODOs
2015-07-30 15:26:06 -07:00
86a6e4914f
Merge pull request #14922 from rhatdan/netlabel
...
Label /etc/resolv.conf, /etc/hosts ... correctly in shared network co…
2015-07-30 15:03:49 -07:00
f50b916ca6
Windows: Remove some TODOs
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-30 14:46:51 -07:00
e809919e26
lint fix and enable linter for cliconfig package
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-30 14:37:37 -07:00
5c9e5bfb0f
Merge pull request #15106 from jgkamat/links
...
Fix a couple broken links
2015-07-30 17:28:11 -04:00
d4836cd7ec
Documentation improvements and code cleanups for graph package
...
Expand the godoc documentation for the graph package.
Centralize DefaultTag in the graphs/tag package instead of defining it
twice.
Remove some unnecessary "config" structs that are only used to pass
a few parameters to a function.
Simplify the GetParentsSize function - there's no reason for it to take
an accumulator argument.
Unexport some functions that aren't needed outside the package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-30 14:27:10 -07:00
0a9ec21818
Windows: Top (non-)implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-30 14:25:15 -07:00
41d9270a40
Merge pull request #15170 from runcom/i-like-cleaning
...
Remove HostConfig,SetHostConfig from daemon.container
2015-07-30 17:23:58 -04:00
8505183252
Merge pull request #14950 from ottok/master
...
Multiple fixes to 'docker stats' output
2015-07-30 14:02:35 -07:00
030f61df3d
Merge pull request #14885 from jlhawn/fix_cp_symlink
...
Fix copying of symlinks in containers
2015-07-30 13:42:40 -07:00
David Calavera
Alexander Morozov
John Howard
Tianon Gravi
Harald Albers
Michael Crosby
Brian Goff
Zhang Wei
Tibor Vass
Manfred Touron
Yuan Sun
Jessica Frazelle
Doug Davis
Stephen Day
Tibor Vass
jrabbit
Alessandro Boch
Srini Brahmaroutu
Phil Estes
Eric Windisch
Jessie Frazelle
Morgan Bauer
Aaron Lehmann