9a8f1b7673
Merge pull request #16359 from cpuguy83/skip_racey_test
...
Skip racey TestDockerCmdWithTimeout
2015-09-16 18:37:14 -04:00
5cf3a6e010
Skip racey TestDockerCmdWithTimeout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-16 18:36:35 -04:00
3394fedf32
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
2015-09-17 00:23:25 +02:00
5cbcbfc03c
Merge pull request #16031 from thockin/14069-dns-options
...
Add support for DNS options
2015-09-16 23:59:19 +02:00
677a6eaf8f
Merge pull request #16261 from vdemeester/integration-dockercmd
...
Move dockerCmd to pkg/integration and add tests to it
2015-09-16 17:40:33 -04:00
4a2c3733bd
Merge pull request #16351 from mavenugo/vin_ln_kv
...
Vendoring in libnetwork and libkv
2015-09-16 14:10:49 -07:00
3d4685e258
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com>
2015-09-16 14:06:45 -07:00
b9a3660d1e
Merge pull request #16316 from vbatts/vbatts-events
...
daemon/events: let Log be [slightly] blocking
2015-09-16 13:57:06 -07:00
fb01c2ea3c
Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test
...
Skip TestRunDeviceDirectory when no /dev/snd
2015-09-16 13:56:11 -07:00
ac34ce0307
Merge pull request #16305 from estesp/hooks-for-the-hooks-gods
...
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
2015-09-16 13:55:16 -07:00
5b99591e18
Merge pull request #16308 from runcom/graph-unparam
...
graph: remove unused functions parameters
2015-09-16 13:54:23 -07:00
c1e59b94e2
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
2015-09-16 13:43:02 -07:00
74a8f2f668
Merge pull request #15861 from brahmaroutu/gccgo_x86
...
Enable building Docker with gcc-go on x86
2015-09-16 13:29:02 -07:00
bfc4e38429
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
2015-09-16 13:17:10 -07:00
2c53643b33
adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
...
temporarily disabling registry builds as crypto package is broken with gccgo.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-16 18:56:01 +00:00
814c19591d
Vendoring in libnetwork and libkv
...
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
(Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516 )
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-16 11:54:28 -07:00
88b895111b
Skip TestRunDeviceDirectory when no /dev/snd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-16 14:43:30 -04:00
259a0fb16c
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
2015-09-16 20:29:16 +02:00
a2f545c86d
Clarifying use of flag
...
Updating with Seb's comments
Updating with comments from review
Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-16 11:22:40 -07:00
60db152b20
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
2015-09-16 11:18:17 -07:00
552c361f39
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
2015-09-16 10:01:11 -07:00
50d7fba775
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec816
2015-09-16 09:56:38 -07:00
e148e763b8
Update native execdriver to exploit libcontainer hooks
...
Using @mavenugo's patch for enabling the libcontainer pre-start hook to
be used for network namespace initialization (correcting the conflict
with user namespaces); updated the boolean check to the more generic
SupportsHooks() name, and fixed the hook state function signature.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-16 12:51:14 -04:00
0a5aac1ff6
Fix bash completion when extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-16 18:17:40 +02:00
7b1930063f
Merge pull request #16309 from LK4D4/fix_volumes_race
...
volumes: add synchronization to Count and List
2015-09-16 11:28:51 -04:00
e0fee019ca
Merge pull request #16314 from Microsoft/10662-stopsignal2
...
Windows: Turn off TestBuildStopSignal
2015-09-16 09:42:01 -04:00
606c6e8f57
Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
...
updates to readme documents for manual page
2015-09-15 15:18:19 -07:00
be082715c7
Merge pull request #16324 from calavera/update_changelog
...
Update changelog for version 1.8.2.
2015-09-15 14:51:53 -07:00
3b7cdfcd6b
Update changelog for version 1.8.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-15 17:43:37 -04:00
9c9b748ad8
Remove unused variable, fix #16310
...
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com>
2015-09-15 22:20:10 +02:00
fc77ea787e
Revert "Make events test more deterministic in go1.5"
...
This reverts commit 386aefb9fc
2015-09-15 15:55:18 -04:00
6167c7bfb8
Windows: Turn off TestBuildStopSignal
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-15 11:56:54 -07:00
09e7dd03f8
daemon/events: let Log be [slightly] blocking
...
With go1.5's concurrency, the use of a goroutine in Log'ing events was
causing the resulting events to not be in order.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-09-15 14:28:22 -04:00
2d21996eec
volumes: add synchronization to Count and List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-15 10:38:53 -07:00
96699e06dd
updates to readme documents for manual page
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-15 12:08:02 -05:00
59311faaed
Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
...
Remove volume references when container creation fails.
2015-09-15 10:55:51 -04:00
723f587b56
graph: remove unused functions parameters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-15 15:34:15 +02:00
e91f2c26ce
Merge pull request #15069 from duglin/UseErrorPackage
...
Use the new error package
2015-09-15 09:28:53 -04:00
db2ac8655d
Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
...
Fix container register failed during daemon start and then start the container
2015-09-15 11:46:03 +02:00
0d873f6e70
Merge pull request #16279 from coolljt0725/clean_up
...
Clean up: remove redundant value assign in runconfig/parse.go
2015-09-15 11:43:38 +02:00
d3379946ec
Refactor the statistics of network in docker stats
...
For now docker stats will sum the rxbytes, txbytes, etc. of all
the interfaces.
It is OK for the output of CLI `docker stats` but not good for
the API response, especially when the container is in sereval
subnets.
It's better to leave these origianl data to user.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-15 15:40:34 +08:00
99b40d1e14
Merge pull request #16295 from BWITS/master
...
typo
2015-09-15 08:42:04 +02:00
370ca6e401
Merge pull request #16282 from mavenugo/ln_uns
...
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
2015-09-14 22:18:50 -04:00
386b7bc71b
typo
...
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
2015-09-15 11:58:20 +10:00
58d6919183
Merge pull request #16197 from aaronlehmann/carry-15539
...
Carry #15539 : Avoid redundant HEAD requests on push
2015-09-14 17:15:32 -07:00
2eedaf0389
Fix minor documentation typo.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
2015-09-14 17:08:04 -07:00
a90ed92df0
Merge pull request #16283 from nalind/journald-not-nil
...
Remove unnecessary check for nil CString
2015-09-14 19:45:36 -04:00
7ce270d4ea
Merge pull request #15931 from vdemeester/api-client-ps-coverage
...
Add more unit tests on api/client/ps package
2015-09-14 14:02:49 -07:00
bda964d085
Merge pull request #16247 from calavera/unexport_volumedriver_interface
...
Unexport VolumeDriver.
2015-09-14 13:47:00 -07:00
2c6c07752c
Remove volume references when container creation fails.
...
Volumes are accounted when a container is created.
If the creation fails we should remove the reference from the counter.
Do not log ErrVolumeInUse as an error, having other volume references is
not an error.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-14 16:16:46 -04:00
Tibor Vass
Brian Goff
Sebastiaan van Stijn
Antonio Murdaca
David Calavera
Tim Hockin
Jess Frazelle
Alexander Morozov
Srini Brahmaroutu
Madhu Venugopal
Mary Anthony
Jessica Frazelle
Harald Albers
Christian Rotzoll
Vincent Batts
John Howard
Alexander Morozov
Mike Brown
Antonio Murdaca
Hu Keping
Phil Estes
Bill W
Stephen Day
Trevor Pounds