Tibor Vass
6e1d19dd58
Merge pull request #16359 from cpuguy83/skip_racey_test
...
Skip racey TestDockerCmdWithTimeout
Upstream-commit: 9a8f1b767314cd61a4f213906a89df319b7736c3
Component: engine
2015-09-16 18:37:14 -04:00
Brian Goff
7d7547b76d
Skip racey TestDockerCmdWithTimeout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5cf3a6e01049c6557645e45732c1a04860f1c327
Component: engine
2015-09-16 18:36:35 -04:00
Sebastiaan van Stijn
be5aed80c9
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
Upstream-commit: 3394fedf3282aedb16c6f3576e0aec721e7e8286
Component: engine
2015-09-17 00:23:25 +02:00
Antonio Murdaca
af40a9a21d
Merge pull request #16031 from thockin/14069-dns-options
...
Add support for DNS options
Upstream-commit: 5cbcbfc03cc11de8d58dd0977327bb6a8cfc9fa4
Component: engine
2015-09-16 23:59:19 +02:00
Brian Goff
10a1fde8b9
Merge pull request #16261 from vdemeester/integration-dockercmd
...
Move dockerCmd to pkg/integration and add tests to it
Upstream-commit: 677a6eaf8f33360e87fb915e632a5d0e8e380dbd
Component: engine
2015-09-16 17:40:33 -04:00
David Calavera
e7573766cd
Merge pull request #16351 from mavenugo/vin_ln_kv
...
Vendoring in libnetwork and libkv
Upstream-commit: 4a2c3733bd904919c17fbf007361093d87609686
Component: engine
2015-09-16 14:10:49 -07:00
Tim Hockin
655513db24
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
David Calavera
9ef3eefa22
Merge pull request #16316 from vbatts/vbatts-events
...
daemon/events: let Log be [slightly] blocking
Upstream-commit: b9a3660d1e007a38585e0bb769169ea0911c0e18
Component: engine
2015-09-16 13:57:06 -07:00
David Calavera
72a3863e6b
Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test
...
Skip TestRunDeviceDirectory when no /dev/snd
Upstream-commit: fb01c2ea3cbc723d4f6950f8d004bbc064acd1f3
Component: engine
2015-09-16 13:56:11 -07:00
Jess Frazelle
a067d73ef6
Merge pull request #16305 from estesp/hooks-for-the-hooks-gods
...
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
Upstream-commit: ac34ce0307aeeeba715e16d3cac8e5a7a07a6e1e
Component: engine
2015-09-16 13:55:16 -07:00
Alexander Morozov
7077353720
Merge pull request #16308 from runcom/graph-unparam
...
graph: remove unused functions parameters
Upstream-commit: 5b99591e18d71085619122fc43d8920548b0e6b6
Component: engine
2015-09-16 13:54:23 -07:00
David Calavera
ad5e2fda43
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
Upstream-commit: c1e59b94e2de1f6380dce451886185117bbde06f
Component: engine
2015-09-16 13:43:02 -07:00
Jess Frazelle
767330f121
Merge pull request #15861 from brahmaroutu/gccgo_x86
...
Enable building Docker with gcc-go on x86
Upstream-commit: 74a8f2f668380d800c3ecce30fe509d997f9b106
Component: engine
2015-09-16 13:29:02 -07:00
David Calavera
63f5d12fc4
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
Upstream-commit: bfc4e38429baec7414364bbe20787245d3f2b432
Component: engine
2015-09-16 13:17:10 -07:00
Srini Brahmaroutu
6ad0539e3d
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 >
Upstream-commit: 2c53643b33fbba5851afcc7067117a7b75cc5dbb
Component: engine
2015-09-16 18:56:01 +00:00
Madhu Venugopal
7ff16017f2
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 >
Upstream-commit: 814c19591d875a747433f87ae84dffbf58c4d21a
Component: engine
2015-09-16 11:54:28 -07:00
Brian Goff
28003be63b
Skip TestRunDeviceDirectory when no /dev/snd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 88b895111b57e49b4cdb9c3965e87925ad8947fa
Component: engine
2015-09-16 14:43:30 -04:00
Sebastiaan van Stijn
5e58ae50d3
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
Upstream-commit: 259a0fb16ceac921763172127183059dea7e3c46
Component: engine
2015-09-16 20:29:16 +02:00
Mary Anthony
c2bbdd98b1
Clarifying use of flag
...
Updating with Seb's comments
Updating with comments from review
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a2f545c86d37635d3a9f8fa869356218d6991c16
Component: engine
2015-09-16 11:22:40 -07:00
David Calavera
5b99d6a57b
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
Upstream-commit: 60db152b209ede8e463b74459902f02d8d44e097
Component: engine
2015-09-16 11:18:17 -07:00
David Calavera
da0763c0bb
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
Upstream-commit: 552c361f3988993c43698fdaa8607a2830c9f567
Component: engine
2015-09-16 10:01:11 -07:00
Jessica Frazelle
fd675380c0
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
Madhu Venugopal
e3b5e8b7ff
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)
Upstream-commit: e148e763b8e7879855022690fdea88a6bf869195
Component: engine
2015-09-16 12:51:14 -04:00
Harald Albers
27422ef1df
Fix bash completion when extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0a5aac1ff6cbacfeefb34702b4726a4e189b1bb9
Component: engine
2015-09-16 18:17:40 +02:00
Brian Goff
c99dd532dd
Merge pull request #16309 from LK4D4/fix_volumes_race
...
volumes: add synchronization to Count and List
Upstream-commit: 7b1930063fcf6eda698ef93989a35657a0644cf5
Component: engine
2015-09-16 11:28:51 -04:00
Brian Goff
58d500daa7
Merge pull request #16314 from Microsoft/10662-stopsignal2
...
Windows: Turn off TestBuildStopSignal
Upstream-commit: e0fee019ca4a961149ea9bb6210ed5a4c8c5ab17
Component: engine
2015-09-16 09:42:01 -04:00
moxiegirl
3a894b4cd3
Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
...
updates to readme documents for manual page
Upstream-commit: 606c6e8f57dd32b041364af019b681cf1d44669b
Component: engine
2015-09-15 15:18:19 -07:00
Jess Frazelle
bf1f233fb1
Merge pull request #16324 from calavera/update_changelog
...
Update changelog for version 1.8.2.
Upstream-commit: be082715c7184df185bfde0acaccdbdf2460779d
Component: engine
2015-09-15 14:51:53 -07:00
David Calavera
de4b1f5bc6
Update changelog for version 1.8.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b7cdfcd6b7a1c22a8318afaac16e5328b56ff1f
Component: engine
2015-09-15 17:43:37 -04:00
Christian Rotzoll
8d4c894e27
Remove unused variable, fix #16310
...
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com >
Upstream-commit: 9c9b748ad8fefb059d0c6bf585593ae1b623cc51
Component: engine
2015-09-15 22:20:10 +02:00
Vincent Batts
5aa203fb95
Revert "Make events test more deterministic in go1.5"
...
This reverts commit 386aefb9fcf65f1a5f68fd61e5108ea0858d2d3f.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: fc77ea787e33864284c14ca743bf3ebc0f50c249
Component: engine
2015-09-15 15:55:18 -04:00
John Howard
fa3b248d8f
Windows: Turn off TestBuildStopSignal
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6167c7bfb8431e5e83130fd44bd36d75da488b21
Component: engine
2015-09-15 11:56:54 -07:00
Vincent Batts
6bc65656e8
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 >
Upstream-commit: 09e7dd03f8740d7865ea91c56a231ce9ae9bec82
Component: engine
2015-09-15 14:28:22 -04:00
Alexander Morozov
8dd1931b2b
volumes: add synchronization to Count and List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2d21996eec8d3e6100f19fa0d0fa7adad25285ca
Component: engine
2015-09-15 10:38:53 -07:00
Mike Brown
361f21e647
updates to readme documents for manual page
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 96699e06dd05bef436c0b9e9df64f102c44e7329
Component: engine
2015-09-15 12:08:02 -05:00
Brian Goff
19987593e7
Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
...
Remove volume references when container creation fails.
Upstream-commit: 59311faaed4e3384fc8da738a57a25f17ae07e05
Component: engine
2015-09-15 10:55:51 -04:00
Antonio Murdaca
407bf841c2
graph: remove unused functions parameters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 723f587b56b940ac5ea79e567b47da91270955b1
Component: engine
2015-09-15 15:34:15 +02:00
Brian Goff
700bfcfe4a
Merge pull request #15069 from duglin/UseErrorPackage
...
Use the new error package
Upstream-commit: e91f2c26ce38787e159162d2c4a43744396e3308
Component: engine
2015-09-15 09:28:53 -04:00
Antonio Murdaca
852d9066b4
Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
...
Fix container register failed during daemon start and then start the container
Upstream-commit: db2ac8655d046b97b33636077faa420a700d8bfc
Component: engine
2015-09-15 11:46:03 +02:00
Antonio Murdaca
5562327b20
Merge pull request #16279 from coolljt0725/clean_up
...
Clean up: remove redundant value assign in runconfig/parse.go
Upstream-commit: 0d873f6e708913fcfa8ba2c6fcb57872cbaafbc9
Component: engine
2015-09-15 11:43:38 +02:00
Hu Keping
c71aa53e3d
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 >
Upstream-commit: d3379946ec96fb6163cb8c4517d7d5a067045801
Component: engine
2015-09-15 15:40:34 +08:00
Sebastiaan van Stijn
e0de6dc515
Merge pull request #16295 from BWITS/master
...
typo
Upstream-commit: 99b40d1e149157de06065c1cc92c23c2b07706ee
Component: engine
2015-09-15 08:42:04 +02:00
Phil Estes
36a12430ca
Merge pull request #16282 from mavenugo/ln_uns
...
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
Upstream-commit: 370ca6e401b251085a33f50e842f6567d2e9924e
Component: engine
2015-09-14 22:18:50 -04:00
Bill W
826aca1e6d
typo
...
Signed-off-by: Bill Wang <ozbillwang@gmail.com >
Upstream-commit: 386b7bc71b07ee2317266ba64c0d59642b4042ab
Component: engine
2015-09-15 11:58:20 +10:00
Stephen Day
943e453907
Merge pull request #16197 from aaronlehmann/carry-15539
...
Carry #15539 : Avoid redundant HEAD requests on push
Upstream-commit: 58d6919183f9e796b1d3462fa79ce30fc0b72082
Component: engine
2015-09-14 17:15:32 -07:00
Trevor Pounds
b8f6767a06
Fix minor documentation typo.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
Upstream-commit: 2eedaf0389f663c8768893cd333cdd6df9e194e2
Component: engine
2015-09-14 17:08:04 -07:00
Brian Goff
4af52a5987
Merge pull request #16283 from nalind/journald-not-nil
...
Remove unnecessary check for nil CString
Upstream-commit: a90ed92df0b55cea8d2cf64858db10aeacf6775c
Component: engine
2015-09-14 19:45:36 -04:00
David Calavera
1f4f6c3414
Merge pull request #15931 from vdemeester/api-client-ps-coverage
...
Add more unit tests on api/client/ps package
Upstream-commit: 7ce270d4ea17d5ec01fe00581fbabf4c5274f0e1
Component: engine
2015-09-14 14:02:49 -07:00
David Calavera
ad942e9805
Merge pull request #16247 from calavera/unexport_volumedriver_interface
...
Unexport VolumeDriver.
Upstream-commit: bda964d0859157bb25d1579cbd3e45b005a072e7
Component: engine
2015-09-14 13:47:00 -07:00
David Calavera
bfef76b67b
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 >
Upstream-commit: 2c6c07752c8d89fa72249c24285ede1b4e579b24
Component: engine
2015-09-14 16:16:46 -04:00
