9da2bc7d4c
Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu
...
add menu.md, make index.md command line reference, update typos/minor…
Upstream-commit: 691bbeaf4411c56b9f5f19efb54db01c533ab8fc
Component: engine
2016-07-01 10:00:54 -07:00
db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
8a1c0cca14
Merge pull request #24217 from vdemeester/23887-docs
...
Improve systemd service unit in *Automatically start containers*
Upstream-commit: b36f068bc5bd2f26ad4e5d93ce9213403e3e58d1
Component: engine
2016-07-01 08:02:36 -07:00
3c95c21ab6
Improve systemd service unit in *Automatically start containers*
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 48744e03e951c7ab4be180fbf6c1f56108512efa
Component: engine
2016-07-01 15:19:28 +02:00
3b1a7d7ee7
Merge pull request #24179 from nicolaka/master
...
[Docs] added nfs docs
Upstream-commit: 75923481d71e53637b6f889b0aab6e47342b7c86
Component: engine
2016-07-01 12:38:57 +02:00
86b27dbb73
Merge pull request #24199 from tonistiigi/update-swarm
...
Update swarmkit, add support for external ca
Upstream-commit: 972c6a7113bffc91c6206f13758951acafa2e461
Component: engine
2016-07-01 00:50:32 -07:00
b4d6f25674
Add documentation for external CA features in API/CLI
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4
Component: engine
2016-06-30 18:08:57 -07:00
42cbfed77c
Merge pull request #24177 from yongtang/24168-s390x
...
Fix s390x build failure by removing golang.org/x/sys/unix
Upstream-commit: 2358d5425e02f49e7c05d6370e2a3e9d5033ed8c
Component: engine
2016-06-30 17:38:57 -07:00
bda6fa8f54
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
a4340d91a9
Vendor updated swarmkit, libnetwork, engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 54255f53d8575d50aec4d58869240e01c41dad1b
Component: engine
2016-06-30 17:21:39 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
186c875016
Merge pull request #24003 from tonistiigi/fix-duplicate-layers
...
Fix duplicate layers in exported tar
Upstream-commit: 98094460602130039a8ae576ca2b5a559d1bd274
Component: engine
2016-06-30 17:07:58 -07:00
b9da2674ad
Merge pull request #24169 from wenchma/stack-link
...
Fix docker stack link
Upstream-commit: 50672d18567d060b1e4506c24b8b528067649df1
Component: engine
2016-06-30 16:54:41 -07:00
a166a756ca
Merge pull request #24187 from khudgins/newstorageplugins
...
Added HPE volume plugin listing to docs
Upstream-commit: c3e391cc9b454bac58f47ccc63b8dcee81b0db23
Component: engine
2016-06-30 16:53:46 -07:00
34ed0e262c
Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1
...
Windows: Skip RunCidFileCleanupIfEmpty on RS1
Upstream-commit: a0d068e7c643b489395bb3d4d2f24997cb735a03
Component: engine
2016-06-30 16:36:41 -07:00
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
9f0a770513
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
14e8a9a9a9
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: f98f596c19cb589569ec89bd12d562d8ddd03843
Component: engine
2016-06-30 14:30:11 -07:00
624acb6899
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com >
Upstream-commit: 841f9859944250585b2adf2c9bf2ad5332ccc0bd
Component: engine
2016-06-30 14:15:44 -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
ed6f72c122
Added HPE volume plugin listing
...
Signed-off-by: Keith Hudgins <greenman@greenman.org >
Upstream-commit: 87ef5b425472c442c9b79e018ee05b0724fdca8f
Component: engine
2016-06-30 14:13:54 -04: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
a111812a86
Revendor golang.org/x/sys to remove golang.org/x/sys/unix
...
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.
This fix revendor golang.org/x/sys to removed the import
of "golang.org/x/sys/unix".
Note: The last commit removes the reference to
"golang.org/x/sys/unix".
This fix fixes #24168 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ba39912a62edd237640dbdf6809d3fc14a2320c4
Component: engine
2016-06-30 06:55:21 -07: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
3aada352fd
Fix s390x build failure by removing golang.org/x/sys
...
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.
This fix removed the import of "golang.org/x/sys/unix".
This fix fixes #24168 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f3d8658fffbf901845c937a40efa66a5b06cdfc3
Component: engine
2016-06-30 06:32:32 -07: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
2191f675ed
Fix docker stack link
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 93ed4b35fa6b35a24a79e3e4f9cfaea29982e7a4
Component: engine
2016-06-30 17:22:42 +08: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
ce55ac5368
Merge pull request #23974 from hopkings2008/devmapper_log
...
Add detail error logs when 'Unknown Device' error happens if devicema…
Upstream-commit: d2da1e3997c0d199c08c652c1285025415517f8d
Component: engine
2016-06-29 23:39:40 -07: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
b9ac815dbd
Fix duplicate layers in exported tar
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 41bf7de73be5d35f40aca9eb68064aa3e8bb9a54
Component: engine
2016-06-29 18:06:42 -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
