101ca2b440
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
2016-06-17 10:27:34 -07:00
e5e1b41404
Merge pull request #23675 from anusha-ragunathan/add_disable
...
Add disable flag for plugin Install.
Upstream-commit: 906c1dc5a07827d48bede8e73e4b8673f711eea0
Component: engine
2016-06-17 09:38:26 -07:00
297c4a4979
Merge pull request #23663 from albers/completion-swarm-update--cert-expiry
...
bash completion for `docker swarm update --cert-expiry`
Upstream-commit: 6d47b06094ffa04a6299b7c5a61beb3cbe2e655b
Component: engine
2016-06-17 18:15:56 +02:00
79014c743c
Merge pull request #23674 from justincormack/accepted
...
Missing line feed after accepting node
Upstream-commit: 83658c5b64413ee6df4c64dcf98acbd407c6f570
Component: engine
2016-06-17 16:08:37 +00:00
c99aad7fca
Missing line feed after accepting node
...
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: c34d752419f0e9c17aa759df1a8314974b0d17ed
Component: engine
2016-06-17 15:49:35 +01:00
a9608bfa10
Add disable flag for plugin Install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
2016-06-17 07:48:43 -07:00
71af4dcb33
fix invalid typo in error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 2322ccb8fff46a4d3a84f3ef214cb473816374af
Component: engine
2016-06-17 15:27:54 +01:00
6b5e5294c2
bash completion for docker swarm update --cert-expiry
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
2016-06-17 08:49:06 +02:00
f2adde44a9
Merge pull request #23656 from sfsmithcha/check_cmd_line
...
update output for node commands, minor edits
Upstream-commit: 8f9c7fab24d777e5ade6ed75f01e15e4b0fde79c
Component: engine
2016-06-16 22:54:28 -07:00
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -07:00
800ec66e2d
Merge pull request #23652 from dnephin/better-bundle-load-errors
...
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
2016-06-16 21:40:30 -07:00
f381416006
Merge pull request #23647 from vieux/improve_messages_node_cmds
...
improve some messages in the node subcmds
Upstream-commit: 4c5f1a7e5bfb49647eeb76d20628c7daac65ef8d
Component: engine
2016-06-17 03:20:30 +00:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
7f08beb5b2
Add integration test for parsing swarm update options
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a933ac3c27ac88cf69a2bc2bc16ce076486c0206
Component: engine
2016-06-16 19:50:01 -07:00
69096baccb
Merge pull request #23532 from swernli/exitCodeFix
...
Fixing exit code return on error case in Windows.
Upstream-commit: a590a6b1800778c86f6649b64283d29d14d83024
Component: engine
2016-06-16 19:01:18 -07:00
92262b0c41
Merge pull request #23580 from cpuguy83/plugin_restore
...
Fix removing plugins and Implement plugin restore after daemon restart
Upstream-commit: f522ed9752f0075bc856c06639d4a408a23d6e35
Component: engine
2016-06-16 18:54:57 -07:00
a992434a69
improve some messages in the node subcmds
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb962235fbf1579cf36bb0582347e8639ec47205
Component: engine
2016-06-16 18:53:24 -07:00
79ea0079e7
Merge pull request #23644 from tonistiigi/fix-leave-delete
...
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
2016-06-17 01:40:45 +00:00
c1713ee511
Merge pull request #23637 from vieux/add_more_fields_inspect
...
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
2016-06-17 01:40:26 +00:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
433425402a
Merge pull request #23549 from dmcgowan/reference-ui-updates
...
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
2016-06-17 00:47:49 +00:00
0cc35ac1ec
Merge pull request #23648 from thaJeztah/fix-overlay-overlay2
...
fix "overlay" -> "overlay2" in error message
Upstream-commit: 6d9d149f9980cfda8ed3eeed7446c068de7ae8b6
Component: engine
2016-06-17 00:21:53 +00:00
cfbfd0a0b9
Merge pull request #23570 from vdemeester/change-plugin-install
...
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
2016-06-17 00:12:56 +00:00
8cac554b16
Merge pull request #23646 from thaJeztah/update-docker-info
...
Update docker info output example
Upstream-commit: 314d9dc03a1623b40a3dc49a666f720508ea67d4
Component: engine
2016-06-16 16:45:44 -07:00
d903446499
fix "overlay" -> "overlay2" in error message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2d4b285a75621604f31058a43cb5ef1d4618533e
Component: engine
2016-06-16 16:42:40 -07:00
d74065d7d9
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
2016-06-16 16:29:23 -07:00
9dba03a4c5
add some more fields in docker service inspect -p
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
2016-06-16 16:22:11 -07:00
2eb1181d59
Merge pull request #23639 from mavenugo/ln-rc2
...
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
2016-06-16 16:17:07 -07:00
dae11af952
Fix removing containers on leaving from pending state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
2016-06-16 16:08:15 -07:00
97ce44d0ef
Update ServiceInspectWithRaw
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
2016-06-17 00:47:22 +02:00
97c2dadb96
Merge pull request #23641 from justincormack/s390seccomp
...
Add the seccomp build tag for s390x now runc updated
Upstream-commit: 2fa38a91441a1b8e610925f41eaba70aa8ca8e58
Component: engine
2016-06-16 15:46:14 -07:00
eaf07b6f62
Update docker plugin install code…
...
… for more consistency (api side).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2c82337b0490dc0a5b8329d1f23c6bad00d8551b
Component: engine
2016-06-17 00:33:21 +02:00
8e11dc51d7
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58529a15535ee2accafdde740214c0d5b595d6e1
Component: engine
2016-06-17 00:32:58 +02:00
10f6f936be
Return membership status on join without timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
2016-06-16 15:27:08 -07:00
f06a10b7f6
Merge pull request #23624 from coolljt0725/fix_restore_sandbox
...
check running again before restore active sandbox
Upstream-commit: 74c4834d32516761c56e3caceada1aa6bb6f8b86
Component: engine
2016-06-16 15:24:58 -07:00
4914ef91f7
Add the seccomp build tag for s390x now runc updated
...
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603
Fixes #23171
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: f8d970169a7ae6dcf46beb69c0367d35d019294e
Component: engine
2016-06-16 23:21:08 +01:00
b2b2e47716
Add some tests for bundlefile and improve the error messages for LoadFile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c0ea589c1b27f8b68e84cfe6692a7639da52ce6d
Component: engine
2016-06-16 18:18:25 -04:00
dc3dc99c53
Merge pull request #23520 from yongtang/23500-docker-info-security
...
Add security info to `docker info`
Upstream-commit: 6b4e2ad90be9dd642219982d7591f73bd5abaae9
Component: engine
2016-06-16 15:15:33 -07:00
bc035d4fca
Merge pull request #23640 from stevvooe/update-not-upate
...
api/client/service: fix minor spelling error in service inspect
Upstream-commit: 6dc58a1d58a476ed5dee42781aa3313a9472f566
Component: engine
2016-06-16 15:12:47 -07:00
8d1c8c8149
Merge pull request #23515 from HackToday/fixoverlay2
...
Add ecryptfs check for overlay2
Upstream-commit: 06da8ce28582417cd93d3242f1d895e46d4a204e
Component: engine
2016-06-16 15:12:09 -07:00
e79dde3c67
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
2016-06-16 15:06:27 -07:00
e47c5a4788
Update swarmkit to 310f1119
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2783568284a0c84bbb53df3c40295d27a151889e
Component: engine
2016-06-16 15:06:27 -07:00
1e8aef0b45
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
Upstream-commit: ef9c058b67b181fc5084ead0bafcca410863726c
Component: engine
2016-06-16 14:55:11 -07:00
73e75a98de
api/client/service: fix minor spelling error in service inspect
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 920e65ccbca0423c43579c9ce3b9331efe14c97b
Component: engine
2016-06-16 14:54:41 -07:00
611e95b628
Merge pull request #23635 from sainath14/network_id_missing
...
Fixes #23596-returns empty string for NetworkID
Upstream-commit: 262081557b8ef9d4c0244170152fa9bee8962166
Component: engine
2016-06-16 14:38:51 -07:00
40a223da0a
Merge pull request #23613 from stevvooe/running-over-replicas
...
api/client/service: list running services over replicas
Upstream-commit: 70c7328d9e97ab271bd4529480bdc7cc202faccf
Component: engine
2016-06-16 14:34:13 -07:00
c73117810f
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
...
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54
Component: engine
2016-06-16 14:33:36 -07:00
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -07:00
0c8b7ed055
Merge pull request #23636 from crosbymichael/hang
...
Set systemd KillMode
Upstream-commit: 5d62f642d91e5ef3a751a41be8924e861beceb7f
Component: engine
2016-06-16 14:17:29 -07:00
