ed6fb41321
Merge pull request #21155 from mountkin/broken-links
...
docs: fix broken links
2016-03-12 23:53:24 +01:00
4e7df42aa8
Merge pull request #21150 from cyphar/fix-pids-stats
...
client: stats: fill in stats info on client
2016-03-12 11:25:15 -08:00
c46ab3d593
Merge pull request #21154 from runcom/fix-typos-1
...
docs: add $ before HOME
2016-03-12 15:15:48 +01:00
36506b7944
docs: fix broken links
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-03-12 21:24:55 +08:00
219e5fdda3
docs: add $ before HOME
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-12 14:11:01 +01:00
b7aae84b5f
Merge pull request #21145 from Microsoft/jjh/fixunittestfailures
...
Windows CI: Fix unit test failures
2016-03-12 10:48:18 +01:00
084241a37b
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>
2016-03-12 14:45:30 +11:00
1fbaf6ee8b
Windows CI: Fix unit test failures
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-11 19:31:08 -08:00
77f501a0c6
Merge pull request #21140 from Microsoft/FlakyTestFix
...
Fixing flaky tests on Windows (again)
2016-03-11 18:49:38 -08:00
c73f2c95cb
Merge pull request #21017 from cpuguy83/use_forked_gocheck
...
Use forked gocheck
2016-03-11 20:42:44 -05:00
471a1aeda8
Merge pull request #21047 from icecrime/update_patch_process
...
Update patch release process
2016-03-12 00:44:01 +01:00
9596e3c501
Update patch release process
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-11 15:40:19 -08:00
b756f89e1d
Fixing flaky tests on Windows (again)
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-11 14:48:52 -08:00
e2d245ad81
Merge pull request #21076 from calavera/fix_builtin_graphdriver_init
...
Make sure we call every graph init with the same root path.
2016-03-11 14:20:39 -08:00
ed6e33eede
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>
2016-03-11 17:15:55 -05:00
81b7a1b756
Merge pull request #21077 from moxiegirl/carry-20160
...
Document Volume Removal in User Guide
2016-03-11 22:08:25 +01:00
ae66d536a5
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>
2016-03-11 12:29:47 -08:00
11d3f7092e
use per-check timeouts
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:52 -05:00
e6e0837cbb
Use forked gocheck and vendor
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:50 -05:00
949e53a0f1
Merge pull request #21127 from icecrime/add_john_maintainer
...
Add @jhowardmsft to maintainers
2016-03-11 11:14:37 -08:00
11d10b77ac
Add @jhowardmsft to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-11 10:47:14 -08:00
9842c7a741
Merge pull request #21129 from allencloud/fix_typos
...
fix typos
2016-03-11 10:16:40 -08:00
12c67f42d8
Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry
...
Remove Windows-specific default registry definitions
2016-03-11 09:31:55 -08:00
1c0474ed63
Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
...
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
2016-03-11 10:54:48 -05:00
bbeb859b64
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-11 23:22:16 +08:00
9ad946eded
Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
...
Fix the vendoring script on MacOS X
2016-03-10 22:45:55 -05:00
87535ca2e9
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>
2016-03-10 18:33:14 -08:00
94445b2fea
Put back the hack that was originally in place.
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 20:27:44 -05:00
edf3c0f112
Merge pull request #21102 from tiborvass/template-improve-contrast
...
Improve github templates
2016-03-10 20:18:30 -05:00
1d094255d5
Merge pull request #21045 from calavera/registry_config_options
...
Move registry service options to the daemon configuration.
2016-03-11 00:48:55 +01:00
8d9396c5f9
Improve github templates
...
Add more contrast and change `you` to `I` in pull requests template.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-10 18:42:44 -05:00
9488696814
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>
2016-03-10 16:43:53 -05:00
496aca386a
Merge pull request #20190 from rhatdan/volumeMan
...
Add a parent man page for docker volumes command
2016-03-10 22:36:50 +01:00
2b8e7ad460
Merge pull request #20478 from msabansal/HNSIntegration
...
Windows libnetwork integration
2016-03-10 13:33:04 -08:00
59586d02b1
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>
2016-03-10 11:53:11 -05:00
9ff7439162
Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
...
Windows: Revendor github.com/Microsoft/go-winio
2016-03-10 08:28:36 -08:00
790d8f8520
Merge pull request #21018 from hqhq/hq_fix_race_exec_tty
...
Fix race condition when exec with tty
2016-03-10 08:27:54 -08:00
943ae26bc0
Merge pull request #20958 from calavera/basic_function_templates
...
Provide basic string manipulation functions for template executions.
2016-03-10 08:08:32 -08:00
04e9087d5d
Merge branch 'master' of github.com:docker/docker into volumeMan
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-03-10 09:39:16 -05:00
e7093a95cf
Merge pull request #21043 from runcom/plugin-sdk
...
docs: extend: plugins: mention the sdk + systemd socket activation
2016-03-10 15:12:23 +01:00
97e07ca10a
docs: extend: plugins: mention the sdk + systemd socket activation
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-10 12:17:06 +01:00
f70f570641
Merge pull request #21073 from moxiegirl/close-carry-20377
...
Add missing fields for NetworkSettings
2016-03-10 10:59:15 +01:00
e8026d8a98
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-03-09 20:33:21 -08:00
49485b769c
Merge pull request #21063 from allencloud/fix-typos
...
fix some typos.
2016-03-09 20:24:56 -08:00
d99be399c3
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
2016-03-09 22:27:37 -05:00
34b82a69b9
fix some typos.
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-10 10:09:27 +08:00
bd7c95e306
Merge pull request #21074 from mlaventure/test-userns-centos
...
Update UserNamespaceInKernel test requirement to handle redhat
2016-03-09 17:53:13 -08:00
8514880997
Provide basic string manupilation functions for template executions.
...
This change centralizes the template manipulation in a single package
and adds basic string functions to their execution.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-09 19:37:12 -05:00
b8a5fb76ea
Add Exposed ports and port-mapping configs to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-09 14:07:23 -08:00
fcff343cb4
Merge pull request #21067 from LK4D4/remove_comment
...
Remove obsolete comment
2016-03-09 13:27:12 -08:00
Vincent Demeester
Jess Frazelle
Sebastiaan van Stijn
Shijiang Wei
Antonio Murdaca
Aleksa Sarai
John Howard
Arnaud Porterie
Tibor Vass
Darren Stahl
Alexander Morozov
David Calavera
Aditi Rajagopal
Brian Goff
allencloud
Aaron Lehmann
Ken Cochrane
Tibor Vass
Dan Walsh
msabansal
Alessandro Boch