cba178dcd2
Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1
...
Windows: Skip TestBuildEmptyCmd on RS1
Upstream-commit: 9828960ade14a49de15d0fbe189a79dd2403dfa4
Component: engine
2016-06-30 16:34:55 -07:00
c93d8a8a0f
Merge pull request #24125 from vdemeester/24117-node-task-filter
...
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
8b734d8800
Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628
...
Revert tasksmax workaround to avoid unsupported bins
Upstream-commit: 295a6a37dcb5b2671a7df6bd3182c14d79f79ae0
Component: engine
2016-06-30 13:20:33 -07:00
12cfc36ae8
Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
...
Prevent CI from getting stuck if shims are left alive
Upstream-commit: 3926d9839468380e277f445f876b47478d51c07e
Component: engine
2016-06-30 11:41:41 -07:00
6bcf7ca500
Merge pull request #24091 from AkihiroSuda/fixZFS24008
...
zfs: call mount.MakePrivate
Upstream-commit: b8cef7c19cea0f4ee670a9362154716b2313a18f
Component: engine
2016-06-30 11:14:30 -07:00
36333fbd7e
Merge pull request #24175 from allencloud/fix-comments-and-handle-err
...
fix comments and handle err
Upstream-commit: cbc4fd2131d06c0342a330843a02632034f1db7b
Component: engine
2016-06-30 19:22:47 +02:00
edfdc3750d
Merge pull request #24159 from yongtang/24090-docker-node-list-hostname
...
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
2016-06-30 09:28:57 -07:00
5af62950c4
Merge pull request #24174 from runcom/fix-grammar
...
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
2016-06-30 17:05:06 +02:00
9ea890bdf9
Merge pull request #24171 from allencloud/make-cmd-short-consistency
...
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
2016-06-30 16:59:32 +02:00
24d57a19bb
fix comments and handle err
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
2016-06-30 21:53:20 +08:00
c89614146c
Merge pull request #24007 from LK4D4/fix_close_races
...
daemon/logger: fix races in channel close
Upstream-commit: e8439971b42a65dd831f80ec76a38e8c8e938cb6
Component: engine
2016-06-30 15:21:17 +02:00
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
169947bdeb
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
cfcc34db47
Merge pull request #24164 from coolljt0725/remove_no_warn
...
Remove dm.no_warn_on_loop_devices in info warning
Upstream-commit: e275865a61c2c776bb2b1673d05bc2f6a8d72042
Component: engine
2016-06-30 15:16:05 +02:00
660ae2c902
Merge pull request #24149 from mavenugo/kn
...
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
2016-06-30 12:23:45 +02:00
d4be296b2a
Merge pull request #24080 from dmcgowan/atomic-writer-mode
...
Set permission on atomic file write
Upstream-commit: cbf785c45a8cca061028ec341320bcbd655cf1fd
Component: engine
2016-06-30 01:00:08 -07:00
ac805da5d2
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
e667b026a1
Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
2016-06-30 13:06:14 +08:00
8038d9fddd
Use HOSTNAME in the output of docker node ls
...
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.
The fix makes needed changes for the output of
`docker node ls`.
An additional test has been added to cover the change in
this fix.
This fix fixes #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
bd38c4db96
Added missing flags for swarm-mode networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
2016-06-29 15:30:57 -07:00
5113884470
Merge pull request #24144 from thaJeztah/update-api-docs
...
docs: add note that we no longer send container-id for exec
Upstream-commit: e904f58e199836fa43ee1c6736e689ef58e4fe10
Component: engine
2016-06-29 15:25:43 -07:00
cadc295e94
Merge pull request #24135 from dnephin/fix_error_message
...
Fix mount opts error message
Upstream-commit: 55d9c49f920b4752337cee959cbc24b5d1b7ee5a
Component: engine
2016-06-29 17:19:00 -04:00
29d2889a79
Merge pull request #23789 from tonistiigi/swarm-integration-tests
...
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
967277989f
Merge pull request #23949 from jstarks/fix_progress_on_load_compressed_layer
...
image: Report load progress on compressed layer size
Upstream-commit: a1fff2ca5afa15ae092668a06b55ae2dc4e039d7
Component: engine
2016-06-29 13:37:12 -07:00
d648d9a308
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
429f89b0c8
Add Charles to docs maintainers
...
Charles is part of the docs team, so
adding him to the list here.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b4163c1189c7389ddda32d9c4ec57708690434c8
Component: engine
2016-06-29 13:13:57 -07:00
6e93db8e82
Set permission on atomic file write
...
Perform chmod before rename with the atomic file writer.
Ensure writeErr is set on short write and file is removed on write error.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 1cd74902810b0eefddd173239cd95b506b34e678
Component: engine
2016-06-29 13:09:13 -07:00
beffe0658c
Fix mount opts error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
2016-06-29 15:14:55 -04:00
d4e14be148
Merge pull request #23955 from yongtang/23768-cpu-count
...
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
8a1b995558
Merge pull request #23946 from dnephin/service-update-args
...
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
2016-06-29 20:24:07 +02:00
1535d36be1
Merge pull request #24071 from vdemeester/24063-empty-filtered-network-list
...
Return an empty network list if nothing matches filter
Upstream-commit: 27ceac2d74df385119fea2606a287d91a4123d82
Component: engine
2016-06-29 11:14:30 -07:00
ec650aece5
Merge pull request #24028 from hqhq/fix_comments_in_aarch64
...
Fix comments in Dockerfile.aarch64
Upstream-commit: ccab57620e9b007a6fa4d462790fad004b62f9b2
Component: engine
2016-06-29 11:06:29 -07:00
5bc8520da4
updates to fix install script for RHEL
...
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org >
updates to fix install script for RHEL
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org >
Upstream-commit: 485c27e18680f5eaeefe5de7f7916ba23f66c8f0
Component: engine
2016-06-29 13:51:27 -04:00
defc31809a
Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
...
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
2016-06-29 10:48:41 -07:00
7dfc0b0c86
Merge pull request #24050 from ncoolz/issue-cluster-store-config
...
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
943b955f19
Fix service update of Args
...
add a unit test
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07b59ef210490df19f65da950d7d41176d104a31
Component: engine
2016-06-29 12:41:57 -04:00
596823812f
Merge pull request #24126 from noxiouz/fix_doc_api
...
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
2016-06-29 18:16:04 +02:00
d906df91ca
Remove extra comma in Image Pull API examples
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
2016-06-29 19:04:42 +03:00
a758d1d64d
Fix --filter=desired_state behaviour
...
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
2016-06-29 17:40:34 +02:00
e14d2bc523
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
2016-06-29 08:27:25 -07:00
edd4ca39cd
Fixes /swarm/join endpoint documentation
...
The JSON payload given in the API documentation is wrong, fixing it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 97c9491b0d395dc923e8b4e335839662c17aff46
Component: engine
2016-06-29 11:27:22 +02:00
c6d459baa5
Revert tasksmax workaround to avoid unsupported bins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 6509cc4e63f50661f6563f45153b23599cc6665c
Component: engine
2016-06-29 08:10:10 +02:00
f1627bde25
Merge pull request #24072 from anusha-ragunathan/fix-tests
...
Fix daemon tests.
Upstream-commit: 3d231c78e8c57acc31ca4294c73c0d02c9a5ca12
Component: engine
2016-06-29 07:52:21 +02:00
0e7c9136da
remove margin from bottom of swarm mode docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0d6f59e85a2728008aad154d366cc8c92888e871
Component: engine
2016-06-28 19:46:39 -07:00
ed5060064e
zfs: call mount.MakePrivate
...
Fix #24008
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7
Component: engine
2016-06-29 01:55:45 +00:00
c760355112
Fix daemon tests.
...
Fix two test issues:
- pidof is not available in PATH on some Jenkins systems (rhel, centos)
Use kill -0 instead.
- Cleanup after plugin test. This is a stop gap fix. The right way to
fix this, is to shutdown the plugin on daemon shutdown path (except
for the live-restore case). This will be done in a follow up PR.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 6d36431e2395867d7bb101dbfd4340e132fd5438
Component: engine
2016-06-28 15:29:49 -07:00
4850c6643f
Return an empty network list if nothing matches filter
...
Initializing the network list struct in order to return an empty list
instead of a nil object.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a7043ac5c423cf68d4f92024e694887099640d91
Component: engine
2016-06-29 00:06:44 +02:00
217e2bc779
Merge pull request #24061 from dmcgowan/close-reader-after-mount-exec
...
overlay2: close read end of pipe on mount exec
Upstream-commit: 57977fb1273337db0e5da46faf4068c4073aa0bb
Component: engine
2016-06-28 14:58:56 -07:00
23c9812d15
Merge branch 'master' into issue-cluster-store-config
...
Upstream-commit: 679fe7e36a07ff0058b780b99fb9432cd2fb68f4
Component: engine
2016-06-29 06:25:34 +09:00
0660142527
Add integration tests for swarm incompatible
...
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com >
Upstream-commit: d71789828f5c8d2e0f5757f1c003325c4b8a871d
Component: engine
2016-06-29 06:21:02 +09:00
