docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,192 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

434 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 28af4789e6 Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0 
Vendor engine-api v0.3.0
 2016-03-22 16:41:10 -07:00
David Calavera 9e9c73a528 Vendor engine-api v0.3.0 
I tagged the current commit so we have a better reference
of what's in this release.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-22 18:12:16 -04:00
David Calavera 506fb9810c Merge pull request #21396 from aboch/vnn 
Vendoring libnetwork v0.7.0-dev.10
 2016-03-22 15:09:42 -07:00
Tibor Vass 8b8fcb796f Merge pull request #21303 from riyazdf/notary-vendor-docker1.11 
vendor notary for docker1.11
 2016-03-22 17:57:17 -04:00
Alessandro Boch fbdb3c3a4b Vendoring libnetwork v0.7.0-dev.10 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-22 12:36:21 -07:00
Tibor Vass 53d2e5e9d7 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
 2016-03-22 15:12:33 -04:00
Riyaz Faizullabhoy ab3772f72f vendor notary for docker1.11 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 11:28:19 -07:00
Evan Hazlett fc214b4408 add label support for build, networks and volumes 
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-03-22 11:49:06 -04:00
Vincent Demeester d82ad12df8 Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd 
fluentd logger: support all options besides Unix sockets
 2016-03-21 18:09:14 +01:00
Alexander Morozov a05fdd6806 Merge pull request #21283 from runcom/update-test 
vendor docker/distribution d06d6d3b09
 2016-03-21 09:46:28 -07:00
Frank Groeneveld 3cf8a9ede7 Update vendored engine-api for OpenBSD support 
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
 2016-03-21 12:11:11 +01:00
Pierre Carrier 9c2a0739fb bump fluent-logger-golang version 
This version supports async connections.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
 2016-03-20 16:22:21 +00:00
Antonio Murdaca c48439af7f vendor docker/distribution d06d6d3b09 
- fix and add integration tests

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-03-19 12:19:48 +01:00
Tonis Tiigi cc83031ade Vendor containerd, specs, runc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:26 -07:00
Tonis Tiigi 14299daaca Vendor updated grpc, protobuf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:21 -07:00
John Starks b54058bafe Windows: revendor Microsoft/hcsshim to v0.1.0 
This (the first tagged hcsshim release) fixes long-path bugs on
Windows TP5 that affect commit and save. These bugs were blocking
commit of Windows containers that had node.js installed.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-17 21:08:07 +00:00
Tõnis Tiigi 4227119588 Merge pull request #21261 from aboch/vnd 
Vendoring libnetwork v0.7.0-dev.8
 2016-03-16 18:56:49 -07:00
Alessandro Boch 6223291965 Vendoring libnetwork v0.7.0-dev.8 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-16 13:45:34 -07:00
Vincent Demeester 48339017db Vendor engine-api to fba5dc8 
It plumbs net/context.Context through entire API, see docker/engine-api#140

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-03-16 20:25:09 +01:00
John Starks 87c2aad6f1 Windows: revendor go-winio with npipe fixes 
This revendor provides support for CloseWrite() in the npipe transport,
fixes a performance regression introduced in Go 1.6, and improves
npipe performance by allowing the pipe buffer size to be specified.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-15 18:25:34 -07:00
Antonio Murdaca 0f59b0b12c Merge pull request #19831 from cloudflare/optimize-gelf 
GELF logger: Add gelf-compression-type and gelf-compression-level
 2016-03-15 22:35:46 +01:00
Brian Goff f500951598 Merge pull request #20121 from solganik/master 
syslog format
 2016-03-14 20:09:15 -04:00
Vincent Demeester b9361f02da Merge pull request #20970 from dmcgowan/login-oauth 
OAuth support for registries
 2016-03-14 15:49:44 +01:00
Alexander Morozov 2d74f78ab5 Merge pull request #21122 from mavenugo/mviv 
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
 2016-03-13 11:32:58 -07:00
Madhu Venugopal 9047cd40c2 Vendor libnetwork v0.7.0-dev.7 
* Experimental support for macvlan and ipvlan drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-03-11 14:22:25 -08:00
Brian Goff e6e0837cbb Use forked gocheck and vendor 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-11 14:38:50 -05:00
Daniel Dao ae6ee5e4af upgrade go-gelf vendor 
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2016-03-11 15:18:58 +00:00
David Calavera 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
Brian Goff d99be399c3 Merge pull request #21019 from aboch/se 
Add port configs to Sandbox and libnetwork vendoring
 2016-03-09 22:27:37 -05:00
Derek McGowan 5730259f32 Vendor updates to distribution 
Pull in changes for refresh token in the registry client

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-03-09 13:47:57 -08:00
Solganik Alexander f988741823 Fixes #18712: Vendoring srslog to latest version. 
In order to solve the issue metioned in  https://github.com/docker/docker/issues/18712
it is required to use rfc5424 log formatted message, made available in latest srslog library.

Signed-off-by: Solganik Alexander <solganik@gmail.com>
 2016-03-09 22:28:51 +02:00
Zhang Wei f446771f0b Vendor docker/engine-api 
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-09 15:52:44 +08:00
Alessandro Boch 5a65408941 Vendoring libnetwork v0.7.0-dev.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-08 18:47:02 -08:00
John Starks 845dce8465 Windows: Revendor github.com/Microsoft/go-winio 
This fixes docker save when the daemon was launched from a remote
PowerShell session.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-08 12:27:48 -08:00
John Starks 53b8b8f058 Windows: Revendor github.com/Microsoft/hcsshim 
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-05 19:10:32 -08:00
Phil Estes ee2183881b Update engine-api vendor for UsernsMode 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-03-03 09:11:38 -05:00
Sebastiaan van Stijn 15e68dc8ee Merge pull request #20863 from thaJeztah/add-kernel-memory-warning 
Add KernelMemory to "info" and show warning
 2016-03-03 13:14:51 +01:00
Sebastiaan van Stijn dd850530a9 Vendor engine-api 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-03-02 23:32:25 +01:00
John Starks 882edc3f0e Revendor Microsoft/go-winio and Microsoft/hcsshim 
Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-02 14:17:13 -08:00
Sebastiaan van Stijn 3c4d093bab Merge pull request #18766 from mikedanese/gcplogs 
Add logging driver for Google Cloud Logging
 2016-03-02 02:09:44 +01:00
Qiang Huang 53b0d62683 Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-02-29 19:28:37 +08:00
Riyaz Faizullabhoy 0bb1acee37 bumping miekg/pkcs11 dependency for go1.6 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-25 21:29:37 -08:00
Riyaz Faizullabhoy 84dc2d9e70 Vendor in notary v0.2.0 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-25 13:40:00 -08:00
Mike Danese 123f22004b vendor: add dependencies of gcplogs driver 
The added dependencies are:
* golang.org/x/oauth2
* google.golang.org/api
* google.golang.org/cloud

Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-02-24 10:42:32 -08:00
Brian Goff d3bffa1639 Revert "vendor: remove fsnotify" 
This reverts commit bc195e1558.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-23 21:43:27 -05:00
Alexander Morozov 4fc5bd295e Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf 
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-02-23 13:37:20 -08:00
Phil Estes 1c2db56d2f Update engine-api vendoring to latest commit 
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-02-19 16:20:27 -06:00
Alessandro Boch 196b27211b Vendoring libnetwork v0.7.0-dev.3 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-17 17:07:33 -08:00
Aleksa Sarai 093dd39686 vendor: update runc/libcontainer 
This includes all of v0.0.8 as well as a few bug fixes that popped up
during vendoring.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-02-18 01:42:36 +11:00
Aleksa Sarai bc195e1558 vendor: remove fsnotify 
It is not longer used by us, so hack/vendor.sh complains because it
removes unused files (but also complains about removing an entire
vendored project).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-02-18 00:12:53 +11:00
Alexander Morozov 16effc66c0 Vendor new engine-api and go-connections 
There is SOCKS5 proxy support in new versions.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-02-16 10:05:01 -08:00
Aaron Lehmann 4436f07ef4 Update vendored docker/distribution 
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-11 10:28:18 -08:00
Phil Estes 6672d7de20 Merge pull request #20214 from mavenugo/vin0.7.0-dev.1 
Vendor libnetwork v0.7.0-dev.2
 2016-02-11 12:12:58 -05:00
Brian Goff acd8baccff Merge pull request #20209 from aaronlehmann/upper-case-hostnames 
Allow uppercase characters in image reference hostname
 2016-02-11 10:50:05 -05:00
Madhu Venugopal b2e609176d Vendor libnetwork v0.7.0-dev.2 
- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-11 07:09:53 -08:00
Vincent Demeester 9ee8f0ad9d Update shakers vendoring to include the LICENSE 😇 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-02-11 08:38:09 +01:00
David Calavera dfebb6074f Merge pull request #20210 from Microsoft/jjh/hcswin32-v2 
Windows: Revendor HCS to use revised error scheme
 2016-02-10 17:20:14 -08:00
John Howard fadbbd335c Windows: Revendor HCSShim@43858ef3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-10 14:14:45 -08:00
Aaron Lehmann e2afab9c4a Allow uppercase characters in image reference hostname 
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.

Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.

- Vendor updated docker/distribution.

- Add a check to "normalize" that rejects remote names with uppercase
  letters.

- Add test cases to TestTagValidPrefixedRepo and
  TestTagInvalidUnprefixedRepo

Fixes: #20056

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-10 14:03:41 -08:00
John Howard dfdce6e35c Revendor engine-api @ ddfd776c 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-10 13:26:35 -08:00
Madhu Venugopal 84705f15d9 Vendor libnetwork v0.6.1-rc2 
- Fixes #20132 #20140 #20019

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-09 21:46:50 -08:00
Madhu Venugopal 2da61086ea Vendor libnetwork v0.6.1-rc1 
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-05 18:20:22 -08:00
Alexander Morozov 9f0095f14a Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads 
Vendor updated distribution for resumable downloads
 2016-02-05 12:58:53 -08:00
Aaron Lehmann 4d437a29d2 Vendor updated distribution for resumable downloads 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-04 17:33:37 -08:00
Tibor Vass da58ee42bb Merge pull request #19984 from calavera/vendor_engine_api_master 
Vendor engine-api with client context changes.
 2016-02-04 16:20:06 -05:00
David Calavera d8355ead9e Vendor engine-api, go-connections and go-winio. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-04 13:59:57 -05:00
Tonis Tiigi b9a395c85d Remove case sensitive duplicate dir in vendor 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-02-03 13:06:32 -08:00
Amit Krishnan 408092e56b bump logrus to v0.9.0 
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
 2016-02-02 17:53:51 -08:00
Brian Goff a39ad952ec Merge pull request #19889 from Microsoft/jjh/reliabilitytake2 
Windows CI: TP4 reliability hack
 2016-02-01 22:30:51 -05:00
Brian Goff a034ac66eb Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash 
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
 2016-02-01 22:30:08 -05:00
John Howard 2ebcb48cf1 Windows CI: TP4 reliability hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-01 18:02:57 -08:00
John Starks 7ccc0e2101 Revendor Microsoft/hcsshim and vendor Microsoft/go-winio 
This update changes the way hcsshim invokes Windows DLLs to avoid races
with the garbage collector. It also now uses go-winio to access the
pipes used for communication with processes running in the container;
this reduces the number of threads used by docker.exe, improving
scalability.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-02-01 23:11:25 +00:00
Alessandro Boch b80f761b14 Vendoring libnetwork 0.6.0-rc7 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-01 14:52:18 -08:00
Alessandro Boch f943fd7d24 Vendoring libnetwork 0.6.0-rc6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-30 20:03:03 -08:00
cyli 71a1caddf0 Include a new version of notary with less verbose INFO+ logging 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-27 09:46:26 -08:00
Jess Frazelle c39c7e6edf Merge pull request #19760 from cyli/re-vendor-notary 
Re-vendor Notary and docker/go
 2016-01-27 09:36:26 -08:00
cyli 8fd2c8791d Re-vendor notary, as well as change jfrazelle/go to docker/go. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-26 18:02:00 -08:00
Michael Crosby 7b5896702b Update libcontainer to 3d8a20bb772defc28c355534d83 
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-26 15:00:07 -08:00
Jana Radhakrishnan 730a6d2fc2 Vendoring libnetwork v0.6.0-rc5 
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-01-26 11:44:43 -08:00
Arnaud Porterie 269a6d7d36 Merge pull request #19705 from mavenugo/18222 
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
 2016-01-26 09:16:57 -08:00
Aleksa Sarai 71c63aa72e vendor: update engine-api 
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-27 00:34:31 +11:00
Madhu Venugopal 7029d9e6ad Vendor libnetwork v0.6.0-rc4 
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-25 19:51:21 -08:00
Madhu Venugopal 6ac9a2f410 Vendor libnetwork v0.6.0-rc3 
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-25 13:22:47 -08:00
Sebastiaan van Stijn 6d1455e74b Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer 
Hotfix vendor libcontainer
 2016-01-22 16:46:04 -08:00
Aleksa Sarai 40b5eebb0b vendor: *: update libcontainer 
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-22 20:15:09 +11:00
Santhosh Manohar 02c9d48144 Vendor in libnetwork v0.6.0-rc2 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-21 20:46:28 -08:00
Aaron Lehmann 921eae9d6d Vendor updated distribution package 
Another day, another revendor.

This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.

Fixes #19526

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 11:01:14 -08:00
Aaron Lehmann a160dd4987 Vendor updated distribution 
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380.

Fixes #19476

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-20 15:46:11 -08:00
Alexander Morozov 7bddbdf360 Merge pull request #19503 from jfrazelle/update-logrus 
bump logrus
 2016-01-20 12:54:49 -08:00
David Calavera bcf155bb7a Merge pull request #19469 from crosbymichael/libcontainer-resource-hf 
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
 2016-01-20 11:31:14 -08:00
Jessica Frazelle 95695aa38c
bump logrus 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-20 09:51:09 -08:00
Vincent Demeester 87b7ff5267 Merge pull request #19465 from mavenugo/sysd 
Vendor libnetwork v0.6.0-rc1
 2016-01-20 09:02:21 +01:00
Michael Crosby 5f73ab8952 Update libcontainer to 47e3f834d73e76bc2a6a585b48d 
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-19 15:34:08 -08:00
Madhu Venugopal ee3b42f385 Vendor libnetwork v0.6.0-rc1 
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-19 13:50:17 -08:00
Aaron Lehmann 588e27f9a5 Vendor updated docker/distribution package 
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-19 13:28:51 -08:00
Santhosh Manohar bccf653082 Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7 
- Fixes the issue of Shutdown() not working, resulting in hung
  goroutines

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-17 08:17:13 -08:00
Jess Frazelle 4c89b1f72c Merge pull request #19355 from riyazdf/notary-revendor 
notary revendor into docker
 2016-01-15 01:02:35 -08:00
Riyaz Faizullabhoy dd7436c832 revendor notary and wrap friendlier error messages 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-01-14 20:35:59 -08:00
Santhosh Manohar 5347f7cd94 Vendoring libnetwork v0.5.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-14 10:48:48 -08:00
Sebastiaan van Stijn e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
 2016-01-14 16:44:58 -08:00