b92020dc4b
Merge pull request #21120 from lirantal/feature/21119-docker-config-for-windows
...
closes #21119 updating documentation for Windows and OSx users
Upstream-commit: f3485bc125afbb0930674e9f5a4f02cdd9989aea
Component: engine
2016-03-14 01:38:26 +01:00
3d62a1d04d
Merge pull request #21122 from mavenugo/mviv
...
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
Upstream-commit: 2d74f78ab59c4e24c5f328f3d85671359b8ed828
Component: engine
2016-03-13 11:32:58 -07:00
60406a0aa6
closes #21119 - updating documentation for Windows and OSx users
...
Updating Docker's documentation file docker configuration file on Windows hosts.
This is of importance for Windows users whom are utilizing the Docker Toolbox.
Signed-off-by: Liran Tal <liran.talh@gmail.com >
Upstream-commit: d2aa521822135009168fe5a13d372fbc6969dc91
Component: engine
2016-03-13 17:55:34 +02:00
05bbd93137
Merge pull request #20977 from allencloud/fix-delete-response-status-code
...
return status code http.StatusNoContent in deleting network when OK
Upstream-commit: a04e16ac35e8dd9ec10462cccebf13cf29b49a51
Component: engine
2016-03-13 11:30:32 -04:00
890088fca6
Merge pull request #21155 from mountkin/broken-links
...
docs: fix broken links
Upstream-commit: ed6fb41321dac41f5a8975be2ca3c64fa78e28f1
Component: engine
2016-03-12 23:53:24 +01:00
1a1627292d
Merge pull request #21150 from cyphar/fix-pids-stats
...
client: stats: fill in stats info on client
Upstream-commit: 4e7df42aa872a0244e5d4bbc5b8876046f922c7d
Component: engine
2016-03-12 11:25:15 -08:00
3bff8135d8
docs: fix broken links
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 36506b7944cf9cea9b3618f00ecfc68a41f86dd8
Component: engine
2016-03-12 21:24:55 +08:00
96dba4b028
docs: add $ before HOME
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 219e5fdda36a18104f7593da9ed8ca097a60aab3
Component: engine
2016-03-12 14:11:01 +01:00
1f1351f12b
client: stats: fill in stats info on client
...
This code was lost in a rebase in the PIDs cgroup merge, fix it so that
`docker stats` actually shows statistics from the PIDs cgroup.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 084241a37b5d3f680228e6bd6cb50f9d0507a365
Component: engine
2016-03-12 14:45:30 +11:00
f4df2c2057
Windows CI: Fix unit test failures
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1fbaf6ee8b6cd0c149472bf465bbffb4e78f8b96
Component: engine
2016-03-11 19:31:08 -08:00
4f429751a9
Merge pull request #21140 from Microsoft/FlakyTestFix
...
Fixing flaky tests on Windows (again)
Upstream-commit: 77f501a0c6f1b584aeb0e0856e6af1ba1fbdc156
Component: engine
2016-03-11 18:49:38 -08:00
1f4d8056b5
Merge pull request #21017 from cpuguy83/use_forked_gocheck
...
Use forked gocheck
Upstream-commit: c73f2c95cbb89e54ae4a60701afb66d5cf1ed5dd
Component: engine
2016-03-11 20:42:44 -05:00
32fe9a153d
docs for experimental vlan net drivers
...
Signed-off-by: Brent Salisbury <brent@docker.com >
Upstream-commit: 9cb6b51fa24b95789693fa65aa58fe3ad1f36014
Component: engine
2016-03-11 16:01:01 -08:00
b48a88b791
Experimental it for net vlan drivers
...
Signed-off-by: Brent Salisbury <brent@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: afeea8c9ca71780cd02abc86ad61e587f26be620
Component: engine
2016-03-11 16:00:27 -08:00
2f2f22770f
Merge pull request #21047 from icecrime/update_patch_process
...
Update patch release process
Upstream-commit: 471a1aeda8d66114d6690d45ea706bfb3e2034fc
Component: engine
2016-03-12 00:44:01 +01:00
2b71072aac
Update patch release process
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9596e3c50172fb21940f941fab686bfecfc6d239
Component: engine
2016-03-11 15:40:19 -08:00
00281f64cd
Fixing flaky tests on Windows (again)
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: b756f89e1d399146fd96c20152bd4efc8505bb62
Component: engine
2016-03-11 14:48:52 -08:00
f943c3b499
Vendor libnetwork v0.7.0-dev.7
...
* Experimental support for macvlan and ipvlan drivers
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9047cd40c2b2eb0609132800b9b8752d1cad0fcc
Component: engine
2016-03-11 14:22:25 -08:00
0bad8836e9
Merge pull request #21076 from calavera/fix_builtin_graphdriver_init
...
Make sure we call every graph init with the same root path.
Upstream-commit: e2d245ad816af8ace52647345ca77b9d0eab641e
Component: engine
2016-03-11 14:20:39 -08:00
78153006fc
Make sure we call every graph init with the same root path.
...
Remove O(n^2) check for several prior configured drivers.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ed6e33eedeaa6b7da44d3b0b3e2eac020b09277a
Component: engine
2016-03-11 17:15:55 -05:00
54863887b3
Document Volume Removal in User Guide
...
Resolves : #20113
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Carry #20160
Tighten language
Updating with comments
Removing articles which is empty
Adding Brian's comments
Putting back what I took out
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ae66d536a5928c9134a4a70761ebc93de0320197
Component: engine
2016-03-11 12:29:47 -08:00
86b3710469
use per-check timeouts
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 11d3f7092e38e1e90d926595c5a4ab9ff0da535c
Component: engine
2016-03-11 14:38:52 -05:00
4f99aa8f32
Use forked gocheck and vendor
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e6e0837cbbebca0736f27b473ffa14c991c77787
Component: engine
2016-03-11 14:38:50 -05:00
14e98ee04a
Merge pull request #21127 from icecrime/add_john_maintainer
...
Add @jhowardmsft to maintainers
Upstream-commit: 949e53a0f1407a550051753f3d92cad5e0670edc
Component: engine
2016-03-11 11:14:37 -08:00
2d0ed2163e
Add @jhowardmsft to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 11d10b77acd106c9a5857de382a719efb6b65a47
Component: engine
2016-03-11 10:47:14 -08:00
841463d9b8
Merge pull request #21129 from allencloud/fix_typos
...
fix typos
Upstream-commit: 9842c7a741ee480c71bfd8e71e1f22893d010411
Component: engine
2016-03-11 10:16:40 -08:00
b1a872ce31
Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry
...
Remove Windows-specific default registry definitions
Upstream-commit: 12c67f42d85103c57c14f27579ff46fccdc3ee07
Component: engine
2016-03-11 09:31:55 -08:00
19d229cc30
Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
...
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
Upstream-commit: 1c0474ed63ac08a3e280ecf7eebcb9e53ae92c8d
Component: engine
2016-03-11 10:54:48 -05:00
1585d5df26
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: bbeb859b6490a03d7c4265762711b551c22e914d
Component: engine
2016-03-11 23:22:16 +08:00
a1a5012791
Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
...
Fix the vendoring script on MacOS X
Upstream-commit: 9ad946eded6fb05ddc331bd565473ea68b83bdd9
Component: engine
2016-03-10 22:45:55 -05:00
88e5d1888e
Remove Windows-specific default registry definitions
...
Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.
There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 87535ca2e9fee074b4174ecc5b01c91a9e922f54
Component: engine
2016-03-10 18:33:14 -08:00
f1c35029ca
Put back the hack that was originally in place.
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 94445b2fea906df1bedec40284591d752def18e2
Component: engine
2016-03-10 20:27:44 -05:00
2a8c1acb35
Merge pull request #21102 from tiborvass/template-improve-contrast
...
Improve github templates
Upstream-commit: edf3c0f11240368baf54ece0b3cb2b5214294b89
Component: engine
2016-03-10 20:18:30 -05:00
76b88b0399
Merge pull request #21045 from calavera/registry_config_options
...
Move registry service options to the daemon configuration.
Upstream-commit: 1d094255d57090d34b2c11c12b253c277ae1ce28
Component: engine
2016-03-11 00:48:55 +01:00
28709e4abf
Improve github templates
...
Add more contrast and change `you` to `I` in pull requests template.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8d9396c5f93ff0f8597e07abf88839071999eadf
Component: engine
2016-03-10 18:42:44 -05:00
7b9d944eb3
Fix the vendoring script on MacOS X
...
The version of sed on MacOS X is different then the one on linux. The mac version
requires a parameter for the inline (-i) flag, where this isn't required on linux.
On the mac it thinks the -e flag is the parameter, and it causes the vendoring script
to fail.
This fix adds an empty string '' as a parameter to sed, which works fine on both the
mac and linux versions.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 9488696814f481d2b0dce03d77657ec6860b9701
Component: engine
2016-03-10 16:43:53 -05:00
8dd2de600d
Merge pull request #20190 from rhatdan/volumeMan
...
Add a parent man page for docker volumes command
Upstream-commit: 496aca386a0bb2ea3a5a42314642ba4693e616ae
Component: engine
2016-03-10 22:36:50 +01:00
3dbccba8c4
Merge pull request #20478 from msabansal/HNSIntegration
...
Windows libnetwork integration
Upstream-commit: 2b8e7ad4609e668d2187e81055e1e76ed0c11552
Component: engine
2016-03-10 13:33:04 -08:00
91021f9750
Move registry service options to the daemon configuration.
...
Allowing to set their values in the daemon configuration file.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 59586d02b1cc004f14cd7ff6b454211f562da326
Component: engine
2016-03-10 11:53:11 -05:00
6152b50e42
Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
...
Windows: Revendor github.com/Microsoft/go-winio
Upstream-commit: 9ff74391620c65661d2d543598fe96efb37f08fc
Component: engine
2016-03-10 08:28:36 -08:00
75088991dc
Merge pull request #21018 from hqhq/hq_fix_race_exec_tty
...
Fix race condition when exec with tty
Upstream-commit: 790d8f8520d23d16cc0a141e6fd56246a45b327a
Component: engine
2016-03-10 08:27:54 -08:00
536ff97acf
Merge pull request #20958 from calavera/basic_function_templates
...
Provide basic string manipulation functions for template executions.
Upstream-commit: 943ae26bc01913fefe415defc575ea10e24f6a2b
Component: engine
2016-03-10 08:08:32 -08:00
9361cfbf1b
Merge branch 'master' of github.com:docker/docker into volumeMan
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 04e9087d5d8d6e4b9857ebe10e153da67433d401
Component: engine
2016-03-10 09:39:16 -05:00
1f8ebb7040
Merge pull request #21043 from runcom/plugin-sdk
...
docs: extend: plugins: mention the sdk + systemd socket activation
Upstream-commit: e7093a95cf324c7928e340c5a388062a1ed05625
Component: engine
2016-03-10 15:12:23 +01:00
b065a55c44
docs: extend: plugins: mention the sdk + systemd socket activation
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 97e07ca10ac315b3d6bbaf72fbe1fd4f7b9a3a2d
Component: engine
2016-03-10 12:17:06 +01:00
3fff146dfd
Merge pull request #21073 from moxiegirl/close-carry-20377
...
Add missing fields for NetworkSettings
Upstream-commit: f70f570641b8e7cec5767f26cc7fc9f31f6294e7
Component: engine
2016-03-10 10:59:15 +01:00
23f9a9fa41
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: e8026d8a98ef30ff0ada303404e02567caebb1b0
Component: engine
2016-03-09 20:33:21 -08:00
e44c6b6aca
Merge pull request #21063 from allencloud/fix-typos
...
fix some typos.
Upstream-commit: 49485b769cdcc220418a36cfd3c1e50fd03b130d
Component: engine
2016-03-09 20:24:56 -08:00
f60019e64d
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
Upstream-commit: d99be399c35df921970bb8bebf4b4bdf774849b3
Component: engine
2016-03-09 22:27:37 -05:00
16d6520e91
fix some typos.
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 34b82a69b94ef9c7913e2809ae918e6f4331201e
Component: engine
2016-03-10 10:09:27 +08:00
