183b647fc0
Merge pull request #16866 from cpuguy83/fix_exp_graphdriver_error
...
Fix exp tests cast protodriver to naivediffdriver
Upstream-commit: 103189e56205d09bc9cfdf77232fac12a5cc8483
Component: engine
2015-10-08 18:01:48 -07:00
caa88a80a6
Fix exp tests cast protodriver to naivediffdriver
...
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.
The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a705ca017349b9d4c71e22de795e7dda40a5ecce
Component: engine
2015-10-08 19:44:50 -04:00
6ec1436aba
Merge pull request #16152 from chlunde/devmapper-mount-flags
...
Use pkg/mount to support more flags in dm.mountopt
Upstream-commit: 6d9a84bcd04cd178033309859eb7bf386a8db85d
Component: engine
2015-10-08 16:02:50 -07:00
f8f0e2ad59
Merge pull request #16861 from moxiegirl/fix-testing-stuff
...
Removing the tests.
Upstream-commit: bccf5c756b1aa80832ff6ca54ff539b71ab73faa
Component: engine
2015-10-09 00:46:02 +02:00
f583b724cf
Removing the tests. We have training site now.
...
Ugh...actually adding the files to delete
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5a94d2b5b9dc0d09d8113396f26d1757142c0661
Component: engine
2015-10-08 15:22:59 -07:00
2c93131473
Merge pull request #16644 from dhiltgen/discovery_tls
...
Add TLS support for discovery backend
Upstream-commit: b50a88cfd78498e5cd943ee3964585a73067e3e4
Component: engine
2015-10-08 14:21:06 -07:00
a78c0b3db5
Merge pull request #16638 from MHBauer/daemon-derepo
...
refactor daemon image tagging
Upstream-commit: 67e38cc54cf528206aa150b05680748943764df8
Component: engine
2015-10-08 14:14:20 -07:00
c33d0611cf
Merge pull request #16643 from chenchun/fix_empty_repository
...
Do not try to cleanupMounts if daemon.repository is empty
Upstream-commit: 4ab8514387286598504e05678d7bde9a5df00f45
Component: engine
2015-10-08 17:10:49 -04:00
510810895d
Merge pull request #16366 from MHBauer/logs-refactor
...
refactor logs to not use internal data structures
Upstream-commit: 01cd67e752aa8a2a7fa9605d5c53bc95862a4d7b
Component: engine
2015-10-08 14:05:02 -07:00
aa4d367db2
Merge pull request #16803 from tiborvass/pkg-broadcaster
...
Move types from progressreader and broadcastwriter to broadcaster
Upstream-commit: bea2257f926ad8e49973d695254669c159987d19
Component: engine
2015-10-08 13:51:08 -07:00
57e2d9f131
Merge pull request #13777 from cpuguy83/graphdriver_extpoints
...
Create extpoint for graphdrivers
Upstream-commit: 4c55464dd3fbbecb0e67f9b33c54f62f3982b500
Component: engine
2015-10-08 13:46:42 -07:00
afbcd19418
Merge pull request #16660 from Microsoft/js/hostname
...
Windows: --hostname support
Upstream-commit: 5ec323aaa298dfa3f60bb28a638df65e7ade8624
Component: engine
2015-10-08 16:11:49 -04:00
eae331677d
Merge pull request #16826 from LK4D4/refactor_listenfd
...
Refactor listenFD function
Upstream-commit: caf7d83c676857243629d1c60fd4def158675b6b
Component: engine
2015-10-08 22:08:52 +02:00
31df7b66e4
Merge pull request #16781 from brahmaroutu/pkg_integration_timeout
...
timeouts causing tests to fail differently. GCCGO CI.
Upstream-commit: 991589d5180f76b2499036e8f1f84500aabfaaf9
Component: engine
2015-10-08 22:02:22 +02:00
6c294ed6e9
Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded
...
client/start: fix logic for discarded signal
Upstream-commit: 4796b5c2f84c38960bb1147dff59d7946172b598
Component: engine
2015-10-08 12:54:31 -07:00
b031358eae
Merge pull request #16581 from fgimenez/11584-stdcopy-test-coverage
...
Added test coverage to StdCopy closes #11584
Upstream-commit: 5bde858db56403ab3644f21aa764f67c574df117
Component: engine
2015-10-08 12:53:25 -07:00
b07ff86773
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
Upstream-commit: 246072e8c5184c78edc9f40435987a7ba26baaa8
Component: engine
2015-10-08 12:27:49 -07:00
e20529cb2b
Merge pull request #16785 from cpuguy83/exec_cleanup
...
Cleanup some issues with exec
Upstream-commit: cc411c054ffc16fff1ec27b49047ff7dba6a1e04
Component: engine
2015-10-08 12:02:03 -07:00
885627be00
Merge pull request #16674 from coolljt0725/use_consistent_command_description
...
Use consistent command description
Upstream-commit: b5d914188efa55e6cf1fcd14334b2c1b61181eea
Component: engine
2015-10-08 12:01:16 -07:00
30a049bac1
Merge pull request #16850 from moxiegirl/fix-command-meta
...
Fixing issues introduced with new commands adding index
Upstream-commit: 80469f8180506b8e3a04e63766b15caddffa9726
Component: engine
2015-10-08 20:59:59 +02:00
336ef562f3
Merge pull request #16791 from flaccid/patch-1
...
Do not run yaourt as root/sudo
Upstream-commit: 73e3d85c28e4fefb035d73ea0e57c6502409b01a
Component: engine
2015-10-08 11:50:56 -07:00
90f924b006
Merge pull request #16817 from cpuguy83/explicit_volume_ls
...
Make `docker volume` behave like `docker network`
Upstream-commit: 9123f77a78c8565e83b8c42a4f14dd0c75f0af66
Component: engine
2015-10-08 11:36:51 -07:00
99f0bfa2a6
Merge pull request #15868 from crosbymichael/aufs-data
...
Add aufs data structure for added mount information
Upstream-commit: b3b9fe8c7730060c9f5a7c5081b773676fdef889
Component: engine
2015-10-08 11:17:20 -07:00
fe5747bb6d
Merge pull request #15693 from vdemeester/15659-image-label-filter
...
Fix #15659 : filter by label for docker images commited
Upstream-commit: 41c99cc62161376981d1c24f30c0e340124778e8
Component: engine
2015-10-08 11:14:51 -07:00
f28b4afc30
Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
...
add TestRunInValidCPUShares
Upstream-commit: 683ee205620e5e622cb13e3d4e14524b3d92dd96
Component: engine
2015-10-08 19:38:21 +02:00
6c42b9a51f
Merge pull request #16815 from duglin/fixHelp
...
Fix help test comment to align with the code
Upstream-commit: 2b6af905faacc5eff0f1b3263974f5af12a92ed4
Component: engine
2015-10-08 09:29:32 -07:00
92bcbdcb5f
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
2015-10-08 09:28:46 -07:00
eb4cfe02ee
Merge pull request #16825 from LK4D4/return_listenbuffer
...
Return listenbuffer behavior
Upstream-commit: c281f692c7f9abc31b733a1344a03b9aa4493934
Component: engine
2015-10-08 09:18:47 -07:00
815dbb240f
Merge pull request #16852 from estesp/overlay-cleanup
...
Simplify dir removal in overlay driver
Upstream-commit: 6654b0e05f663da394bac6ed846187bca90451f5
Component: engine
2015-10-08 08:44:50 -07:00
b45dd9f105
Merge pull request #16842 from coolljt0725/revert_16818
...
Revert add parent img refcount for faster rmi
Upstream-commit: 9e587932078eba3a45d419721d468db46943e4a3
Component: engine
2015-10-08 08:40:35 -07:00
a6e3345892
Merge pull request #16823 from rhvgoyal/check-thin-pool
...
devmapper: Make sure device is a thin pool device
Upstream-commit: c3e5364813848616d2713083cb442760e62417e4
Component: engine
2015-10-08 11:27:53 -04:00
89ab17818a
Timeouts are causing tests to fail differently. GCCGO CI.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ffe32ac371023220075b8ec7ac3cc62b431445b0
Component: engine
2015-10-08 15:14:56 +00:00
f7b1046066
Merge pull request #16848 from thaJeztah/fix-broken-link-in-error
...
Fix broken link in error-message
Upstream-commit: f418f4864bd317755ecf66bd9acc406a7bddc2a9
Component: engine
2015-10-08 11:11:11 -04:00
99dfae8822
Simplify dir removal in overlay driver
...
There is no need to call `os.Stat` on the driver filesystem path of a
container as `os.RemoveAll` already handles (properly) the case where
the path no longer exists.
Given the results of the stat() were not even being used, there is no
value in erroring out because of the stat call failure, and worse, it
prevents daemon cleanup of containers in "Dead" state unless you re-create
directories that were already removed via a manual cleanup after a
failure. This brings removal in overlay in line with aufs/devicemapper
drivers which don't error out if the filesystem path no longer exists.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 6ed11b53743668dba3bcf6ecef4e57a399d95569
Component: engine
2015-10-08 11:04:00 -04:00
85e1a44e76
Merge pull request #16832 from sunyuan3/daemoncommand
...
Replace the deprecated -d with docker daemon.
Upstream-commit: 52de25049609d55aff26b91db12a792ace30f275
Component: engine
2015-10-08 10:06:10 -04:00
6ff15cb8df
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
282a5880a8
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
18faaa074a
Merge pull request #16845 from thaJeztah/is-that-a-container-in-your-repo
...
docs: minor fix in faq, and update link
Upstream-commit: e777f96e59ffed8bcabc4f8937a058c01d17aa58
Component: engine
2015-10-08 08:55:29 -04:00
262c5c28a2
Use consistent command description
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2b0927c9ac23b66d8a05761801d1c5f882ba8dfb
Component: engine
2015-10-08 08:46:21 -04:00
6dd7824ffd
Merge pull request #16844 from thaJeztah/fix-typo-in-maintainers
...
Fix typo in MAINTAINERS
Upstream-commit: c1783a1c2a97a840cfb26e8333ad2ff8c532816f
Component: engine
2015-10-08 14:42:12 +02:00
66bb31005c
Fix broken link in error-message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4830f488d5bcdbe73ab49fcedef0c6f686cbe704
Component: engine
2015-10-08 14:32:34 +02:00
1e33aad6ac
docs: minor fix in faq, and update link
...
The registry doesn't have containers, only images.
Also updated the Docker Hub link to the new location.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6fda30a43753d504faa8a3d06ef886796e954b81
Component: engine
2015-10-08 13:49:30 +02:00
10aeab9367
Fix typo in MAINTAINERS
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 618e00da818bcd72f7062999e8f9729184bdba26
Component: engine
2015-10-08 13:32:58 +02:00
5cf6a93d8d
Revert add parent img refcount for faster rmi
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: b290690d73094bafea58e34dbccb0db37fd8e6ee
Component: engine
2015-10-08 06:46:27 -04:00
8709c3083b
Merge pull request #16780 from Microsoft/jjh/vfs-build-tags
...
Fix VFS build tags
Upstream-commit: 53d24291648f3c610ddb13e131a498e1d27ae676
Component: engine
2015-10-08 09:43:06 +02:00
0012e76955
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
e67f107724
Merge pull request #16783 from Microsoft/10662-cliwait
...
Windows CI: cli_wait_test
Upstream-commit: 4a9d039721ac16b07dffb784b2c1e3f884f62459
Component: engine
2015-10-07 19:39:32 -07:00
ee5def44d4
Replace the deprecated -d with docker daemon.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b08c6b17685d4af40e9705ca0efddbdffdf2657e
Component: engine
2015-10-08 10:25:16 +08:00
5cf2935c37
add TestRunInValidCPUShares
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 042d08a2a89c040b2fc7d97d8cc22a6c4593e275
Component: engine
2015-10-08 10:04:51 +08:00
b5abf96150
Merge pull request #16830 from Microsoft/10662-refixdownload
...
Windows: Regression re-fix builder
Upstream-commit: a8175b751c65b4c2373110f2a513048646336cf9
Component: engine
2015-10-07 19:51:39 -04:00
