a70c2240b7
re-vendor swarmkit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: db271b8833fc0b55998afababdaad60a67e3a982
Component: engine
2016-07-06 21:14:14 -04:00
892399249d
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
2016-07-06 21:14:14 -04:00
4a48f9104a
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8aa37bdbb76a781d73c24800c2bc5373d2289c28
Component: engine
2016-07-06 13:12:37 +02:00
33ecd21d8f
Merge pull request #24230 from mlaventure/vendor-containerd
...
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Upstream-commit: 93731a63502c7fa98b5276284ccd4907d418a793
Component: engine
2016-07-01 13:26:28 -07:00
84d90cb333
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d
Component: engine
2016-07-01 11:46:48 -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
cddb6e635c
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
a556d4c8c6
Merge pull request #23950 from jstarks/no_clone_tp5
...
Windows: Disable VM cloning for TP5 image
Upstream-commit: 1c06ebeeee1a600c0e4fc73d3c7485e5d15abfda
Component: engine
2016-06-27 15:13:50 -07:00
e9a348a21b
Update containerd to b93a33be39bc4ef0fb00bfcb79147
...
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7db7e046315eed5ccfb3a913b965be4b1a595601
Component: engine
2016-06-27 11:45:05 -07:00
a78296b581
Revendor github.com/Microsoft/hcsshim
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: e6022251603b25b26ff70273fbb4474c8050fcf1
Component: engine
2016-06-24 16:12:43 -07:00
5c41618370
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
2016-06-23 20:34:02 +02:00
ebb89af810
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
0014a77b9b
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
2016-06-22 09:40:20 -07:00
57899c6630
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
2016-06-22 09:37:17 -07:00
9b9e6d34ec
Revender hcsshim to v0.3.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ee59c53c2f22d17e0dff8b545ffb793cabec9f94
Component: engine
2016-06-20 16:56:13 -07:00
dc5d595545
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
2016-06-18 19:19:13 -07:00
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
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
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
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
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
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
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
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
99862c3f0b
Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
...
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Upstream-commit: 9cdb6357e2f8c7561ba580c1e16de81d24e1de99
Component: engine
2016-06-16 05:08:44 +00:00
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
4a8d3f13a7
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b675124cf5fc96a6c329b5580ef60304089270c6
Component: engine
2016-06-15 15:11:50 -07:00
6a10bc5376
Update libnetwork to 96d45528599c32354230480a1ebc0
...
This fixes an issue with hanging tests due to store.
Fixes #23560
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
2016-06-15 15:07:04 -07:00
efcb8ab316
Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5af8e2a9c08439049da9a9abc24145c3d1f2e9de
Component: engine
2016-06-14 19:50:34 -07:00
241219195c
Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f2f97f768e51f817336cd56456158bc32ab3b977
Component: engine
2016-06-14 19:50:34 -07:00
955da7c9c3
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
2016-06-15 02:33:16 +00:00
50a4204953
Merge pull request #23551 from tonistiigi/update-swarmkit
...
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
2016-06-15 02:25:31 +00:00
d1fb87c721
Update swarmkit to 25572005f
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cdf279d74df05b2ce2a051fc5b53533ac5249f16
Component: engine
2016-06-14 17:07:14 -07:00
cee3d77054
plugins: vendor engine-api to import new plugin types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e5b7d36e9954ffd8c199c0fcfaa0b9f4bfdeb196
Component: engine
2016-06-14 14:20:27 -07:00
d44cc26f44
Vendoring libnetwork 452dff1
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b79122146008e21a01419953bab2d905c94568d
Component: engine
2016-06-14 13:45:24 -07:00
14ac7227ab
Update containerd and runc vendoring
...
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2e9ea5c194e5fbb83f59e30f8bda5467086598fe
Component: engine
2016-06-14 07:47:31 -07:00
230cf74120
Add dependency to docker/swarmkit
...
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2
Component: engine
2016-06-13 22:16:18 -07:00
96c1665876
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4d8cc9c0a94840a2d45b549925301daa3bfcad3
Component: engine
2016-06-10 15:27:05 -07:00
7f639864bd
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
Upstream-commit: 30bbf184e937ee2aab075a4a6890d9f9f0b74cde
Component: engine
2016-06-09 11:39:39 -07:00
fd09c4f818
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 758f9a8cebbc3f6a0f07cd66146c726452b4207d
Component: engine
2016-06-09 05:48:06 -04:00
99c133c055
Revendor hcsshim to v0.3.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: bb1c54bc1f0379b03eac50949c4b1fba0f91dd57
Component: engine
2016-06-08 17:32:22 -07:00
ecac3fcd79
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
2016-06-08 16:37:08 -04:00
87fa5c341b
Update containerd to cf554d59dd96e459544748290eb91
...
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d17b9f3da064f4c7e70867be5e64d06b127df301
Component: engine
2016-06-07 15:27:23 -07:00
5b8c5d757b
Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com >
Upstream-commit: 66234eaf9bd78ccad44db4a199fa865334e7b418
Component: engine
2016-06-07 18:18:37 +02:00
08ad8f3172
Merge pull request #23269 from vdemeester/migrate-import-to-cobra
...
Use spf13/cobra for docker import
Upstream-commit: f061f556f2d3819f293e76a434c8212d613eca6b
Component: engine
2016-06-07 13:07:30 +02:00
3ff13f560e
Merge pull request #22866 from jstarks/foreign_layers
...
Support layers from external URLs
Upstream-commit: 7d08f3a5ad16446952b9b461feb0895a5c73ea58
Component: engine
2016-06-07 00:27:40 +00:00
d04d755b65
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ca01e57d55699ab9e30f120a1de9d00a477547ad
Component: engine
2016-06-06 13:58:18 +02:00
6075499108
Merge pull request #23063 from yongtang/22961-aws-sdk-go
...
Update aws-sdk-go to v1.1.30
Upstream-commit: 3f970819bb4231375f7821aa54670fd59e384f4d
Component: engine
2016-06-05 16:01:52 -04:00
bd5e8e3754
Vendor docker-credential-helpers v0.3.0
...
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: feab8db60da39ecda00c86b34bf5958ae257a14f
Component: engine
2016-06-04 10:06:07 -07:00
