6 Commits

Author	SHA1	Message	Date
Madhu Venugopal	4a5258148d	Vendoring in libnetwork for native multihost networking ... - brings in vxlan based native multihost networking - added a daemon flag required by libkv for dist kv operations - moved the daemon flags to experimental Signed-off-by: Madhu Venugopal <madhu@docker.com> Upstream-commit: 508065a7adc84e5e63f47b00c379dad6a79d3c5e Component: engine	2015-06-22 04:15:41 -07:00
Eric-Olivier Lamey	9644714f56	Restore --default-gateway{,-v6} daemon options. ... This was added before the libnetwork merge, and then lost. Fixes #13755. Signed-off-by: Eric-Olivier Lamey <eo@lamey.me> Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2 Component: engine	2015-06-05 06:21:22 +00:00
Brian Goff	abc263e355	Merge pull request #13259 from Microsoft/10662-configbridge ... Windows: factor out bridgeConfig from server+config Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80 Component: engine	2015-05-28 12:59:57 -04:00
John Howard	4abb12acf6	Windows: Set default exec driver to windows ... Signed-off-by: John Howard <jhoward@microsoft.com> Upstream-commit: 041ba90dbb713656440fb5eadbd5aba892645350 Component: engine	2015-05-26 16:17:33 -07:00
John Howard	08d07187fd	Windows: factor out bridge server+config ... Signed-off-by: John Howard <jhoward@microsoft.com> Upstream-commit: ead2f80073623cb53ade435811b155fe69f2774e Component: engine	2015-05-23 19:22:06 -07:00
John Howard	e45f408b7c	Windows: Start of daemon config refactor ... Signed-off-by: John Howard <jhoward@microsoft.com> Upstream-commit: b3bca3afc9914de27741a86ac062aea4c5ba825b Component: engine	2015-05-12 09:50:32 -07:00