New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make build cache ignore mtime #12031

Merged
merged 2 commits into from Jun 9, 2015

Conversation

Projects
None yet
@jlhawn
Contributor

jlhawn commented Apr 2, 2015

Build cache uses pgk/tarsum to get a digest of content which is
ADD'd or COPY'd during a build. The builder has always used v0 of
the tarsum algorithm which includes mtimes however since the whole
file is hashed anyway, the mtime doesn't really provide any extra
information about whether the file has changed and many version
control tools like Git strip mtime from files when they are cloned.

This patch updates the build subsystem to use v1 of Tarsum which
explicitly ignores mtime when calculating a digest. Now ADD and
COPY will result in a cache hit if only the mtime and not the file
contents have changed.

NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
function. It is a best-effort approach to determining if two sets of
filesystem content are different.

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented Apr 2, 2015

@jfrazelle @icecrime I'm not sure if someone has already submitted a patch like this. It seems like an optional flag to ADD/COPY is also a popular idea: #4351

@duglin

This comment has been minimized.

Contributor

duglin commented Apr 2, 2015

ping @erikh @tiborvass
I'm worried about breaking backwards compat on this. So, perhaps we could control this feature via a cmd flag on ADD/COPY once #10775 is merged.

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented Apr 2, 2015

@duglin

I'm worried about breaking backwards compat on this.

By backwards compat do you mean how it would result in a cache miss the first time people use it?

So, perhaps we could control this feature via a cmd flag on ADD/COPY

I'm agreeable to that. I can update this PR with some conditionals for using tarsum.v0 or tarsum.v1

@cpuguy83

This comment has been minimized.

Contributor

cpuguy83 commented Apr 2, 2015

I know @tianon has given an explanation as to why just disabling it wouldn't be good, but I can never remember the reason.

I don't know a single person that likes the fact that mtime is used.

@duglin

This comment has been minimized.

Contributor

duglin commented Apr 2, 2015

@jlhawn yup - just worried about people who might count on today's behavior.

@duglin

This comment has been minimized.

Contributor

duglin commented Apr 2, 2015

e.g. haven't had to do this in a while but I know in a past life I would just "touch ..." something to force a rebuild of it - so a content-only check would break those cases.

@cpuguy83

This comment has been minimized.

Contributor

cpuguy83 commented Apr 2, 2015

I guess you can currently do something like touch cachebreaker to deliberatly break the cache

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented Apr 2, 2015

@duglin couldn't you just use --no-cache? Though it may be a sledge hammer for a small nail if you just wanted to invalidate one cached layer.

@duglin

This comment has been minimized.

Contributor

duglin commented Apr 2, 2015

@jlhawn yep exactly, its a bit of an overkill hammer. Kind of reminds me of the discussion in #10682

@phemmer

This comment has been minimized.

Contributor

phemmer commented Apr 3, 2015

Instead of a flag on ADD/COPY, what about a flag on docker build? So far none of the Dockerfile commands have flags. While I'm not opposed to them, I feel like they shouldn't be added unless needed.

To me, a flag on docker build even makes more sense. If you're working in a repo (build context) that doesn't preserve mtimes, it's going to be mtimes for every file in the repo that isn't trustworthy, not just one or two files.

@icecrime

This comment has been minimized.

Contributor

icecrime commented Apr 3, 2015

I like the proposed solution, I'm not sure I see the point of an extra flag for this.

However, this breaks some tests:

--- FAIL: TestBuildADDCurrentDirWithCache (2.04s)
    docker_cli_build_test.go:3033: The cache should have been invalided but hasn't.
--- FAIL: TestBuildADDRemoteFileMTime (2.59s)
    docker_cli_build_test.go:3201: The cache should not have been used but was
@duglin

This comment has been minimized.

Contributor

duglin commented Apr 3, 2015

@phemmer a flag on docker build is possible as long as people are comfortable with it applying to all ADD/COPY commands and don't need to be selective. Having said that though, I worry about forcing the person issuing the docker build to remember to include this flag each time. I suspect that many times the author of the Dockerfile knows about the issue and will want some way to control it from within the Dockerfile to ensure that all users of the Dockerfile get the same caching behavior.
Of course having to specify it on each ADD/COPY is annoying (In practice I do wonder whether it would really be needed on all or just a small handful). In some other previous issue/PR, the idea of setting global flags from within the Dockerfile was mentioned, perhaps this might be a good usecase for it?

@icecrime

This comment has been minimized.

Contributor

icecrime commented Apr 15, 2015

Ping @jlhawn: can you please fix the tests?

@duglin

This comment has been minimized.

Contributor

duglin commented Apr 16, 2015

@icecrime can we get #10775 behind us then we can explore all of the options available for features like this mtime one? I'm not sure we should change the current default behavior, so I think leveraging CMD flags might be a better choice. So, I'm not sure there's a point in tweaking code in PRs like this if we may go a different direction after #10775

@stevvooe

This comment has been minimized.

Contributor

stevvooe commented Apr 23, 2015

👍 for the design. The build cache should use the latest version of tarsum. The debate over whether or not mtime should apply belongs in a tarsum issue.

@LK4D4

This comment has been minimized.

Contributor

LK4D4 commented May 12, 2015

ping @jlhawn looks like tests still failing

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented May 12, 2015

@LK4D4 @icecrime @duglin sorry, I forgot about this PR. Do we want to go with this solution? or should I close it in favor of the cache-strategy flag approach?

@LK4D4

This comment has been minimized.

Contributor

LK4D4 commented May 12, 2015

I'd go with this.
ping @docker/core-maintainers

@duglin

This comment has been minimized.

Contributor

duglin commented May 12, 2015

I don't see how we can go with this since it changes the behavior people will see. For example, if I touch a file in my build context to force a cache miss on a COPY/ADD, this PR will break me. I would prefer if we offered a flag on ADD/COPY to allow people to opt-in to the new behavior.

@phemmer

This comment has been minimized.

Contributor

phemmer commented May 12, 2015

it changes the behavior people will see

Does docker have a compatibility guarantee between releases? Are we locked into this behavior until docker 2.0?

@duglin

This comment has been minimized.

Contributor

duglin commented May 12, 2015

Don't know if its written down but its generally good practice not to change semantics on people in minor (.x) releases.

@tiborvass

This comment has been minimized.

Collaborator

tiborvass commented May 12, 2015

@phemmer if we decide we want this, then it would be in a minor Docker release (next one being 1.7).

EDIT: 1.7 is a minor release

@LK4D4

This comment has been minimized.

Contributor

LK4D4 commented May 13, 2015

I definitely prefer current behavior over flags to instructions. But I prefer tarsum.V2 over both.

@stevvooe

This comment has been minimized.

Contributor

stevvooe commented May 13, 2015

Note that tarsum v0 also doesn't take into account xattrs, so this could be considered a bug.

@thaJeztah

This comment has been minimized.

Member

thaJeztah commented May 13, 2015

if I touch a file in my build context to force a cache miss on a COPY/ADD

Well, you could still date >> foobar in stead of touch. However, IMO the cache should only break if the build-context is actually different. I don't think mtime should be taken into account. Apart from "manually" breaking the cache, do we know an actual use-case where the mtime should break the case (i.e., is important for the resulting image). If there are cases, I think they are very exceptional. We could always add an --use-mtime option :)

Note that tarsum v0 also doesn't take into account xattrs, so this could be considered a bug.

Wasn't there an issue with AUFS not supporting xattrs? Or does my memory fail me here?

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented Jun 8, 2015

@LK4D4 @thaJeztah docs have been updated. Please take a look.

@thaJeztah

This comment has been minimized.

Member

thaJeztah commented Jun 8, 2015

@jlhawn

This comment has been minimized.

Contributor

jlhawn commented Jun 8, 2015

oh, I should go back and correct the typo pointed out by @duglin too. one sec...

jlhawn added some commits Apr 2, 2015

[builder] Make build cache ignore mtime
Build cache uses pgk/tarsum to get a digest of content which is
ADD'd or COPY'd during a build. The builder has always used v0 of
the tarsum algorithm which includes mtimes however since the whole
file is hashed anyway, the mtime doesn't really provide any extra
information about whether the file has changed and many version
control tools like Git strip mtime from files when they are cloned.

This patch updates the build subsystem to use v1 of Tarsum which
explicitly ignores mtime when calculating a digest. Now ADD and
COPY will result in a cache hit if only the mtime and not the file
contents have changed.

NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
function. It is a best-effort approach to determining if two sets of
filesystem content are different.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
[docs] Update builder docs on last-modified times
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

@jlhawn jlhawn force-pushed the jlhawn:build_cache_ignore_mtime branch from 732c65f to cd7e2a6 Jun 8, 2015

@moxiegirl

This comment has been minimized.

Contributor

moxiegirl commented Jun 9, 2015

LGTM

thaJeztah added a commit that referenced this pull request Jun 9, 2015

@thaJeztah thaJeztah merged commit 90259fe into moby:master Jun 9, 2015

4 checks passed

docker/dco-signed All commits signed
Details
experimental Jenkins build Docker-PRs-experimental 1063 has succeeded
Details
janky Jenkins build Docker-PRs 9479 has succeeded
Details
windows Jenkins build Windows-PRs 6377 has succeeded
Details
@cpuguy83

This comment has been minimized.

Contributor

cpuguy83 commented Jun 9, 2015

@thaJeztah

This comment has been minimized.

Member

thaJeztah commented Jun 9, 2015

\o/ don't know when it happened, lost track of mtime 😄

tagomoris added a commit to tagomoris/docker that referenced this pull request Jun 19, 2015

Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

Squashed commit of the following:

commit bb2d681b91bdd5f284da86d90560240acc4f3987
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Tue Jun 16 13:03:00 2015 +0900

    Fix to try to reconnect almost forever (204 years)

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit edc54fb2667ddc243b312046ede6392566309815
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Fri Jun 5 12:44:30 2015 +0900

    Fix code styles with review comments

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit 7fef8788462aa3f5c31f90026e17398eace14796
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Thu Jun 4 10:48:52 2015 +0900

    Add logging driver "fluentd"

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit d5551baa5d6ac41f0850a443555d0de1ecfb18d9
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Thu Jun 4 10:47:50 2015 +0900

    Add libraries for fluentd logging driver

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit 9dffd032f43dca88e8a66685aceb21b0e00cc232
Merge: b81f2ee 59cfc08
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Mon Jun 15 21:41:12 2015 -0400

    Merge pull request #13950 from Microsoft/10662-vfsforreal

    Windows - Really fix VFS this time

commit b81f2ee5f20d094c13893f565ce716595c539d22
Merge: f48fadd ff4e58f
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 17:13:44 2015 -0700

    Merge pull request #13953 from crosbymichael/network-mtu

    Get Mtu from default route

commit ff4e58ff560d864432261a68502a8a5543145fdf
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 15 16:33:02 2015 -0700

    Get Mtu from default route

    If no Mtu value is provided to the docker daemon, get the mtu from the
    default route's interface.  If there is no default route, default to a
    mtu of 1500.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit f48fadd05c5e131757ae305693e5b3ccbc539736
Merge: 4d23f45 6578ad9
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 15 16:19:38 2015 -0700

    Merge pull request #13941 from unclejack/fix_umask

    docker/daemon: set umask to the default on startup

commit 4d23f459adb26deced2843ebb223bd16b5ba3b42
Merge: 748814a dcc4a14
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 16:16:02 2015 -0700

    Merge pull request #13947 from mavenugo/vin

    Picking up missed out vendor files via hack/vendor.sh

commit 748814a97a0bade1375ffa9cee6009a823b6d75e
Merge: 835f1c9 dfec4a4
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 16:12:22 2015 -0700

    Merge pull request #13935 from asbjornenge/tm_syntax_updates

    TM syntax updates

commit 59cfc089820f6f8a2a5f24ddfcf0fe1328c9568c
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Jun 15 15:08:36 2015 -0700

    Windows - Really fix VFS this time

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 835f1c91161db45ed18683b5d75685dea0c5dc2c
Merge: 86d6a5b 20927ff
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Mon Jun 15 23:56:32 2015 +0200

    Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container

    Correct the message of pause and unpause a non-running container

commit 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Merge: b3b04fd 4cb0c93
Author: Josh Hawn <jlhawn@berkeley.edu>
Date:   Mon Jun 15 14:50:17 2015 -0700

    Merge pull request #13869 from jlhawn/multi_line_help_usage

    api/client: Allow for multi-line usage help

commit b3b04fd85a5a44182c872a2765e6732bf9f05a39
Merge: d409b05 a98ea87
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Mon Jun 15 14:37:30 2015 -0700

    Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull

    Store layer digests on pull

commit d409b05970e686993e343d226fae5b463d872082
Merge: 3f11e05 f93fee5
Author: moxiegirl <mary@docker.com>
Date:   Mon Jun 15 13:57:12 2015 -0700

    Merge pull request #13936 from moxiegirl/test-tooling

    Updated retooling for Hugo to go out with 1.7

commit f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Author: Mary Anthony <mary@docker.com>
Date:   Sun Jun 7 20:07:20 2015 -0700

    retooling for hugo
    Tweaking for Hugo
    Updating the Dockerfile with new sed; fix broken link on Kitematic
    Fixing image pull for Dockerfile
    Removing docs targets

    Signed-off-by: Mary Anthony <mary@docker.com>

commit dcc4a14ba31ab195f97dcf264835339a1a00e8d5
Author: Madhu Venugopal <madhu@docker.com>
Date:   Mon Jun 15 11:38:06 2015 -0700

    Picking up missed out vendor files via hack/vendor.sh

    while wokring on another PR, I noticed that hack/vendor.sh was picking
    up unrelated files. Maybe a previous update to the hack/vendor.sh failed
    to run the script and push the vendor changes ?

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Merge: 1157fcc d8592ea
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 15 11:25:35 2015 -0700

    Merge pull request #13942 from calavera/fix_unshare_mount_regression

    Fix regression bind mounting shared.

commit a98ea87e463383a77d7244c78c9da3ac9f2cd086
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Mon Jun 15 11:06:21 2015 -0700

    Store layer digests on pull

    Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
    This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.

    Fixes #13883

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit d8592eaff8bddb6f29c48cc39dec70db884eda00
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 15 10:34:59 2015 -0700

    Revert "contrib/init: unshare mount namespace for inits"

    This reverts commit b6569b6b82df4c5e29ee8f5ebd9db7e36919cefd.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 1157fcc4a4e775a0b6f2dfc9c0c25fcbc453e1a8
Merge: 637023a c7975f1
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Mon Jun 15 10:17:24 2015 -0700

    Merge pull request #13926 from Microsoft/10662-createfixup

    Windows: Fixup compile in daemon_windows.go

commit 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Merge: ee40f29 13f2aa7
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Mon Jun 15 16:25:59 2015 +0200

    Merge pull request #13502 from coolljt0725/conflict_port_and_netmode

    Add --net=container with --publish --expose --publish-all error out

commit 6578ad90c307c5500a7998819743be88f63ef2b3
Author: unclejack <unclejacksons@gmail.com>
Date:   Mon Jun 15 16:36:19 2015 +0300

    docker/daemon: set umask to the default on startup

    This sets up the umask so that it's the same on all systems.

    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit dfec4a48c7ac3ea4604b0a6d400109aa2004bad9
Author: Asbjørn Enge <asbjorn@hanafjedle.net>
Date:   Mon Jun 15 00:04:05 2015 +0200

    Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction

    Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)

commit ac8cbf4952cf745207dbd966109348bbb80c9ebd
Author: Asbjørn Enge <asbjorn@hanafjedle.net>
Date:   Mon Jun 15 00:02:10 2015 +0200

    Updated TextMate install instruction - this bundle is not included in TM :smile: :rocket

    Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)

commit ee40f297122b6998e35cf0992c96dd559ea41b26
Merge: f27c9bc cd44018
Author: moxiegirl <mary@docker.com>
Date:   Sat Jun 13 10:29:56 2015 -0700

    Merge pull request #13927 from moxiegirl/carry-13250

    Carry of PR #13520

commit f27c9bc6e79db23432e84287bbeae9b307e405d0
Merge: cd36b15 85f895c
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Sat Jun 13 12:43:45 2015 -0400

    Merge pull request #13895 from calavera/fix_get_env_split

    Correct getEnv split.

commit cd44018856be421497a35d96f88dd0eec42fae43
Author: Mary Anthony <mary@docker.com>
Date:   Sat Jun 13 09:21:50 2015 -0700

    Carry of PR #13520
    Removinig files

    Signed-off-by: Mary Anthony <mary@docker.com>

commit cd36b15ccb8561de95ee2e018baa778316da4423
Merge: 261af00 0cdc3b7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sat Jun 13 09:14:40 2015 -0700

    Merge pull request #13860 from jlhawn/cli_call_headers

    api/client: have cli.call() return headers

commit c7975f12d6bcdac2812554c4d9ec88820ffe0e61
Author: John Howard <jhoward@microsoft.com>
Date:   Sat Jun 13 09:10:54 2015 -0700

    Windows: Fixup compile in daemon_windows.go

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 261af00282fac3e37d1d0018f1a926b84641625d
Merge: f1ea3e5 0833001
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sat Jun 13 09:00:33 2015 -0700

    Merge pull request #13682 from mavenugo/ln_vin

    Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564

commit f1ea3e5c7462450dea4c260e4781dcc916f538da
Merge: 422fa7f b37832e
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Fri Jun 12 19:59:45 2015 -0700

    Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig

    Refactor verifyHostConfig: change to verifyConfigs and add verify config

commit b37832e353327481579cbe2709f63a34453bf83b
Author: Lei Jitang <leijitang@huawei.com>
Date:   Sat Jun 13 09:31:19 2015 +0800

    Add verify config to verifyContainerSettings

    Signed-off-by: Lei Jitang <leijitang@huawei.com>

commit 422fa7f0a6c27e73125dd1f25de02198033e313e
Merge: 39bf57e 543cf79
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 17:19:51 2015 -0700

    Merge pull request #13749 from Microsoft/adduseragent

    Add GOOS in User-Agent

commit 39bf57e085d3632b2f03b26a4b9dc900d88b164c
Merge: 6a7a757 c646e51
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Fri Jun 12 17:11:18 2015 -0700

    Merge pull request #13344 from hqhq/hq_fix_arm64_test

    Fix unit-test build error on ARM64

commit 6a7a7570bb50c3127931e012d19d10b8837d95ac
Merge: cd71c5e 0395661
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 17:05:34 2015 -0700

    Merge pull request #12833 from burke/faster-changes

    Optimize archive.ChangesDirs on Linux

commit 083300168fb0f42e022e9fa2ce47a7b2aac9967a
Author: Madhu Venugopal <madhu@docker.com>
Date:   Fri Jun 12 13:51:57 2015 -0700

    Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564

    This PR brings the vendored libnetwork code to
    3be488927db8d719568917203deddd630a194564, which pulls in quite a few
    fixes to support kvstore, windows daemon compilation fixes,
    multi-network support for Bridge driver, etc...

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit cd71c5ed43edd345a3d92548010c07b9584d1796
Merge: 421b9b6 0a529b6
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 12 15:40:20 2015 -0700

    Merge pull request #13836 from amylindburg/master

    Update plugins.md

commit 0a529b6e7ad33dc05a154861061cf498e1350516
Author: Amy Lindburg <amy.lindburg@docker.com>
Date:   Tue Jun 9 22:20:48 2015 -0700

    Update plugins.md

    Fixed broken link.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugins.md

    Some other broken links!

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugin_api.md

    FIxing broken links.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugins_volume.md

    Fixing more links.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

commit 421b9b685949f76c205457e70c3bd8fb951c5034
Merge: 5bddafe d2c5fcc
Author: David Calavera <david.calavera@gmail.com>
Date:   Fri Jun 12 13:48:22 2015 -0700

    Merge pull request #13916 from Microsoft/10662-compileserver

    Windows: Patch up compile after adjustCpuShares

commit d2c5fcc8d5ada5e2f33562ca9f7a9b05d0b01676
Author: John Howard <jhoward@microsoft.com>
Date:   Fri Jun 12 13:00:59 2015 -0700

    Windows: Patch up compile after adjustCpuShares

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 5bddafe16938ee4af4c1f3e7380e82a610a9242d
Merge: e7533d7 e5b7f61
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 12 20:24:31 2015 +0200

    Merge pull request #13912 from icecrime/13902_improve_test

    Replace "sleep" by "top" in test implementation

commit e7533d7f81fdb3d33efd91c751d25b9d3b80f4e1
Merge: 27e2837 e89f837
Author: David Calavera <david.calavera@gmail.com>
Date:   Fri Jun 12 11:12:32 2015 -0700

    Merge pull request #13494 from Microsoft/10662-vfsdriveroption

    Windows: Allow VFS

commit 27e2837c6cd2c0d9b9ff9a0fda943a15b7162798
Merge: 2351557 855a056
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 12 19:53:18 2015 +0200

    Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp

    Fixes content-type/length for stats stream=false

commit e5b7f61f090bfc951590dd5dad3f6bb1ce3888ba
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 10:45:42 2015 -0700

    Replace "sleep" by "top" in test implementation

    Eliminate any chance of race condition by replacing a call to sleep by a
    call to top, and rely on test cleanup logic to have it exit cleanly.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 235155760788651cbde9eb9a6e0adca444a64267
Merge: 5a02d07 09de92b
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 10:42:07 2015 -0700

    Merge pull request #13902 from ibuildthecloud/api-fixes

    Set omitempty for IP and PublicPort to conform w/ API 1.18

commit 855a056af7829504ccc310587445c61d62427b51
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 11:27:39 2015 -0400

    Fixes content-type/length for stats stream=false

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 09de92b891c15bda593cf47617f032d2b0b40605
Author: Darren Shepherd <darren@rancher.com>
Date:   Fri Jun 12 09:49:53 2015 -0700

    Set omitempty for IP and PublicPort to conform w/ API 1.18

    Signed-off-by: Darren Shepherd <darren@rancher.com>

commit e89f837bc6a26e08e02f25b6e474d4ad7bdfb101
Author: John Howard <jhoward@microsoft.com>
Date:   Tue May 26 12:45:08 2015 -0700

    Windows: Allow VFS

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 5a02d0727bab071e270cf02521192a7d1d257b69
Merge: c98eafe f3d1826
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 07:27:07 2015 -0700

    Merge pull request #13899 from mavenugo/hp

    Vendoring in libnetwork to fix #13873.

commit c98eafe564b1828fb894749c33a8864257034af2
Merge: e70d680 a408790
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 09:37:53 2015 -0400

    Merge pull request #13906 from chenchun/closed_chan

    Fix send on closed channel bug

commit e70d680d72183c4ca3860436283a318037c844c8
Merge: 00b8fec d898372
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 09:23:45 2015 -0400

    Merge pull request #13903 from dqminh/fix-cli-exec-output

    TestExecStopNotHanging: log output as string

commit f3d1826350d5624f1e82d764d2367a4584f04465
Author: Madhu Venugopal <madhu@docker.com>
Date:   Thu Jun 11 18:04:03 2015 -0700

    Vendoring in libnetwork to fix #13873.

    Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit a408790de8f317d79fb52acb3a5220846a0ffcba
Author: Chun Chen <chenchun.feed@gmail.com>
Date:   Fri Jun 12 15:42:34 2015 +0800

    Fix send on closed channel bug

    Signed-off-by: Chun Chen <chenchun.feed@gmail.com>

commit d898372568a3e00d4bda0359393d833a9f30fe1d
Author: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Date:   Thu Jun 11 22:53:55 2015 -0400

    TestExecStopNotHanging: log output as string

    When cmd failed, log its ouput as string instead of byte array to prevent test
    log like: [49 53 ....] exit status 1

    Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>

commit 00b8fec75f3a113c851013e0f0d559cc6d96b84d
Merge: 71ead0e c0b4421
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 11 17:44:37 2015 -0700

    Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation

    refactor: separate graph from image

commit 85f895ce681ebbc3a1990ef73875cf94b5c77d17
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 11 14:33:51 2015 -0700

    Correct getEnv split.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Merge: 0de7065 ed39fbe
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 11 14:20:50 2015 -0700

    Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI

    Adjust disallowed CpuShares in /containers/create

commit 0de7065897573551bb23ead8d1d21d22e7657f17
Merge: 98391f0 5d51118
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 14:12:17 2015 -0700

    Merge pull request #13801 from bexelbie/bex_manpage_indention

    Updates man page generation to use go-md2man v1.0.2

commit 98391f0a39e5696df0f5e7fd59be0b7f158d0564
Merge: cada9b5 566466e
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 13:22:03 2015 -0700

    Merge pull request #13890 from moxiegirl/vieux-fix

    Updating with fix for first line and the vieux/amy comment on website

commit 566466e71402b1d75412061d6ee80b07bb8e37b1
Author: Mary Anthony <mary@docker.com>
Date:   Thu Jun 11 12:48:01 2015 -0700

    Updating with fix for first line and the vieux/amy comment on website

    Signed-off-by: Mary Anthony <mary@docker.com>

commit cada9b54b52246fd284e3025da5ad936a7521c1c
Merge: e3821fe 19c31a7
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 12:42:06 2015 -0700

    Merge pull request #13865 from Mic92/zfs-selinux

    zfs: correctly apply selinux context

commit e3821feb137a81683f1763cc64b85d47ad4545bf
Merge: b27f960 b0d7483
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 10:32:53 2015 -0700

    Merge pull request #13783 from tianon/vendor-pruning

    Add intelligent vendor pruning (via "go list")

commit b0d748325f1eaae8d4f138b5785307cef2a784d3
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 15:07:23 2015 -0700

    Update "vendor/"

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit 9e4ee3dea52ec0615f59c729ed972d08732a3edd
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 14:47:27 2015 -0700

    Add intelligent vendor pruning (via "go list")

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit f61d595b55b48428b7268b85a23b6e61b649f6d9
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 15:20:04 2015 -0700

    Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit b27f9605043377b46ecd7b983bea0e46da78cab7
Merge: 9001c4b 9ad8928
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Thu Jun 11 09:30:52 2015 -0700

    Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string

    Display empty string instead of <nil> when IP opt is nil.

commit 9001c4bc486934f91d5809b335232875e639dafb
Merge: 4fc6449 212dfb4
Author: moxiegirl <mary@docker.com>
Date:   Thu Jun 11 08:59:35 2015 -0700

    Merge pull request #13839 from eolamey/13838-fix-docs-url

    Fix docs URL not using https.

commit 4fc6449944901d0c696ddeb296434871d196ec20
Merge: ef171af 386ab25
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 11 09:12:34 2015 -0400

    Merge pull request #13861 from mrjana/cnm_integ

    Vendoring libnetwork to fix stale arp cache issue

commit 9ad89281aeb31d251f97af7ea419d5ca865b8199
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Thu Jun 11 07:53:39 2015 +0000

    Display empty string instead of <nil> when IP opt is nil.

    Fixes #13878.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit ef171afdbb8b766216eb87be51afe6243820a266
Merge: 2b27fe1 e2c6a8b
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Thu Jun 11 05:12:45 2015 -0400

    Merge pull request #13590 from mountkin/fix-archive-tests

    Add the parent directory to changes set if new files are generated

commit 19c31a703fb84f1079cc2466d435cb4913a4bfd2
Author: Jörg Thalheim <joerg@higgsboson.tk>
Date:   Thu Jun 11 00:34:18 2015 +0200

    zfs: correctly apply selinux context

    fixes #13858

    Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>

commit 5d51118c7c6399ed3002e6c19d860e89be79d160
Author: Brian (bex) Exelbierd <bexelbie@redhat.com>
Date:   Mon Jun 8 14:30:33 2015 +0200

    Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4

    The main Dockerfile to was updated - this update brings the
    sub-directory specific file inline with it.

    Fixes #12866

    Signed-off-by: Brian Exelbierd <bex@pobox.com>

commit 2b27fe17a1b3fb8472fde96d768fa70996adf201
Merge: 883d661 141cd2a
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Thu Jun 11 07:13:19 2015 +0200

    Merge pull request #13862 from Microsoft/10662-fixelementsrestored

    Show actual number of elements restored

commit 212dfb45dec64b470307aec22623f2d80be6695f
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Wed Jun 10 06:13:11 2015 +0000

    Fix docs URL not using https.

    Fixes #13838.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit 386ab251372a40e895115e7a927d349412cf9d89
Author: Jana Radhakrishnan <mrjana@docker.com>
Date:   Wed Jun 10 15:15:18 2015 -0700

    Vendoring libnetwork to fix stale arp cache issue

    Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

    Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

commit 883d661b693fceab343d764366731c165e360d50
Merge: ad9080a 0964a66
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 10 17:05:41 2015 -0700

    Merge pull request #13867 from calavera/fix_daemon_cleanup_order

    Cleanup driver and graph db after stopping containers.

commit ad9080a87c847121897f4d00dcde4541d392dd7c
Merge: 466efeb f88e620
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 16:55:15 2015 -0700

    Merge pull request #13868 from jfrazelle/update-gitignore-man

    update gitignore for new manpages

commit 0cdc3b7539b618778becf233157604698b4e8281
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Wed May 13 18:36:36 2015 -0700

    api/client: have cli.call() return headers

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 4cb0c93f9287d29934894c871d156801122516cd
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Wed May 13 19:45:01 2015 -0700

    api/client: Allow for multi-line usage help

    Subcommands can provide multiple usage synopses.

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 0964a664e85c88568863df30f43b0e3974093348
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 16:07:53 2015 -0700

    Cleanup driver and graph db after stopping containers.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit f88e620359eaf986a843714126a9a7df5e25e115
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 10 16:11:15 2015 -0700

    update gitignore for new manpages

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 466efebf0e9c41740316ec66c63ec6c7d64f9f57
Merge: b6049b5 84aec1e
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Wed Jun 10 15:57:37 2015 -0700

    Merge pull request #13863 from Microsoft/typoclientutils

    Typo fix in api\client\utils.go

commit 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Author: John Howard <jhoward@microsoft.com>
Date:   Wed Jun 10 15:24:53 2015 -0700

    Typo fix in api\client\utils.go

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 141cd2a1f26f3455a1daf20420ca1efb5a9e1a16
Author: John Howard <jhoward@microsoft.com>
Date:   Wed Jun 10 15:18:51 2015 -0700

    Show actual number of elements restored

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b6049b5c4963bb1b82ba381cdce69d1083bcf59e
Merge: 9da65ed eacae64
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 15:04:19 2015 -0700

    Merge pull request #13804 from moxiegirl/proposal-man-pages

    PROPOSAL: Moving man pages out of docs

commit 9da65ed84f9fc285fa2d122c8341a897e5d0eb29
Merge: add64dc c9d7131
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 10 14:12:14 2015 -0700

    Merge pull request #13854 from crosbymichael/revert-shared-root

    Revert shared container rootfs

commit eacae64bd89ccc95a6db7bda76d36014e71e70ac
Author: Mary Anthony <mary@docker.com>
Date:   Mon Jun 8 10:48:20 2015 -0700

    Moving man pages out of docs
    Adding in other areas per comments
    Updating with comments; equalizing generating man page info
    Updating with duglin's comments
    Doug is right here again;fixing.

    Signed-off-by: Mary Anthony <mary@docker.com>

commit add64dc297a4549e1abe0e0c5176eeabd198fb47
Merge: 05644cc 416e855
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Wed Jun 10 16:38:07 2015 -0400

    Merge pull request #13832 from mapk0y/fix-error-msg

    fix typo.

commit 05644ccea9910179274ffc9e587a8787fe9cceae
Merge: 17324c9 8fb0ca2
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Wed Jun 10 16:28:56 2015 -0400

    Merge pull request #13272 from Microsoft/10662-daemonrefactorv2

    Windows: Refactor daemon

commit 17324c91e33d43472f94188b25ee4bed49630e39
Merge: 65d0670 96d06e1
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 12:45:12 2015 -0700

    Merge pull request #13015 from mariussturm/master

    Add logging driver for GELF via UDP

commit 8fb0ca2c35c0df38a79c4eac62fd7d04e3688240
Author: John Howard <jhoward@microsoft.com>
Date:   Fri May 15 16:34:26 2015 -0700

    Windows: Refactor daemon

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Merge: 12149e8 c5f4988
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 10 11:53:47 2015 -0700

    Merge pull request #13853 from jfrazelle/fix-hack-make

    ugh typo in hack scripts fix, introduced by 2b4facdf

commit c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Wed Jun 10 11:29:27 2015 -0700

    Revert shared container rootfs

    This is breaking various setups where the host's rootfs is mount shared
    correctly and breaks live migration with bind mounts.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Author: Marius Sturm <marius@graylog.com>
Date:   Fri May 29 23:00:46 2015 +0200

    add UDP GELF logging-driver

    allows to send container logs to Graylog or Logstash.

    Signed-off-by: Marius Sturm <marius@graylog.com>

commit c5f49886fa1a7ce67ab020a19c4aea65225c3658
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 10 11:00:59 2015 -0700

    ugh typo in hack scripts fix, introduced by 2b4facdf

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 12149e829369e879a1978420b6ec2100a4b4fadd
Merge: 5821f13 74c12aa
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 10 10:34:13 2015 -0700

    Merge pull request #13754 from cpuguy83/13753_fix_events_64

    Default events since to current time

commit 74c12aa42918e3f349afcb46e6e54b724ef789a9
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 19:47:46 2015 -0700

    Default events since to current time

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 5821f13b8c8222ca75f5909236036222d175a25e
Merge: 46af724 e12839f
Author: James Turnbull <james@lovedthanlost.net>
Date:   Wed Jun 10 11:41:44 2015 -0400

    Merge pull request #13844 from ponsfrilus/master

    Typo psuedo - pseudo

commit 46af724e81fe6890dc2709101e3c3f680db77631
Merge: de90aef 35a7f0c
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Wed Jun 10 08:32:57 2015 -0700

    Merge pull request #12371 from rhatdan/kill

    docker kill should return error if container is not running.

commit de90aef4115c5a183e4d9406842562933aa93cf4
Merge: 55bdb51 9a9dc5b
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Wed Jun 10 10:01:50 2015 -0400

    Merge pull request #12813 from Microsoft/10662-nolinuxgraph

    Windows: Don't build Linux graph drivers

commit e2c6a8be7c03d3c8405421c07ec6fb1c5c3a6200
Author: Shijiang Wei <mountkin@gmail.com>
Date:   Fri May 29 16:39:14 2015 +0800

    Add the parent directory to changes set if new files are generated

    The "TestChangesWithChanges" case randomlly fails on my development
    VM with the following errors:
    ```
    --- FAIL: TestChangesWithChanges (0.00s)
            changes_test.go:201: no change for expected change C /dir1/subfolder != A /dir1/subfolder/newFile
    ```

    If I apply the following patch to changes_test.go, the test passes.

    ```diff
    diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
    index 290b2dd..ba1aca0 100644
    --- a/pkg/archive/changes_test.go
    +++ b/pkg/archive/changes_test.go
    @@ -156,6 +156,7 @@ func TestChangesWithChanges(t *testing.T) {
            }
            defer os.RemoveAll(layer)
            createSampleDir(t, layer)
    +       time.Sleep(5 * time.Millisecond)
            os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)

            // Let's modify modtime for dir1 to be sure it's the same for the two layer (to not having false positive)
    ```

    It seems that if a file is created immediately after the directory is created,
    the `archive.Changes` function could't recognize that the parent directory of
    the new file is modified.

    Perhaps the problem may reproduce on machines with low time precision?
    I had successfully reproduced the failure on my development VM as well as
    a VM on DigitalOcean.

    Signed-off-by: Shijiang Wei <mountkin@gmail.com>

commit e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Author: Nicolas Borboën <ponsfrilus@users.noreply.github.com>
Date:   Wed Jun 10 13:22:27 2015 +0200

    Typo psuedo - pseudo

    Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>

commit 55bdb51659b3982ae78cd24ed0823f6b8d0bb9b2
Merge: 4750e1f bd9814f
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 19:51:06 2015 -0700

    Merge pull request #13699 from calavera/volume_backwards

    Allow to downgrade local volumes from > 1.7 to 1.6.

commit bd9814f0db9c8a087e42b66eabb8413bf1b2ab66
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 09:26:41 2015 -0700

    Allow to downgrade local volumes from > 1.7 to 1.6.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Merge: c3b962d c68e7f9
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Tue Jun 9 17:24:30 2015 -0700

    Merge pull request #13784 from mrjana/cnm_integ

    libnetwork: Add garbage collection trigger

commit c3b962d327d161171157b95d587946ebe5a5cfba
Merge: 13baeb3 38acd31
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 17:12:20 2015 -0700

    Merge pull request #13831 from LK4D4/update_libcontainer

    Update libcontainer to v2.1.1

commit 13baeb3b70c5f145614cbbd582daa8a6fcbd2b79
Merge: ceee259 123a058
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 15:34:53 2015 -0700

    Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302

    Do not set auth headers for registry v1 if 302

commit ceee2595b6b38ec2f7fb01436884b41902acfecc
Merge: 5e86b81 2b4facd
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Jun 9 14:34:52 2015 -0700

    Merge pull request #12583 from Mic92/hack/explicit-bundles

    Hack/explicit bundles

commit 416e855e9b33464c81e86ff47ed19c93a781e604
Author: mapk0y <mapk0y@gmail.com>
Date:   Wed Jun 10 06:26:07 2015 +0900

    fix typo.

    Signed-off-by: mapk0y <mapk0y@gmail.com>

commit 38acd31e8a99ef043f9a5cf84f968ebebc31614e
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Tue Jun 9 13:54:57 2015 -0700

    Update libcontainer to v2.1.1

    It includes fix for mounting / as volume on SELinux.
    docker/libcontainer#619

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit 5e86b818ed41c4dfd90624b43b5e4da29e39d653
Merge: 18ddc27 3044816
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Tue Jun 9 13:30:55 2015 -0700

    Merge pull request #13828 from calavera/plugin_fixes

    Fix volume plugin serialization.

commit 18ddc2728d53d4ed014e615115947006fdfe2a20
Merge: 06aef2b 7b9ae69
Author: David Calavera <david.calavera@gmail.com>
Date:   Tue Jun 9 11:30:06 2015 -0700

    Merge pull request #13805 from aboch/czo

    Add integ test for unpublished ports in ps o/p

commit 06aef2b5c24d694a4876bd43c57868dad59e2e11
Merge: 90259fe 73bc885
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Tue Jun 9 10:42:24 2015 -0700

    Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container

    daemon: cleanup getting container logic

commit 30448166deca62e1f3a43f8e86cd02244b499344
Author: David Calavera <david.calavera@gmail.com>
Date:   Tue Jun 9 10:23:01 2015 -0700

    Fix volume plugin serialization.

    Unmarshal errors into strings.
    Fix `omit` typos.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 7b9ae696d86066f6245e2c17e7afd5ce8e868fe5
Author: Alessandro Boch <aboch@docker.com>
Date:   Fri Jun 5 14:50:11 2015 -0700

    Add integ test for unpublished ports in ps o/p

    - This is a test to assert the fix #13734

    Signed-off-by: Alessandro Boch <aboch@docker.com>

commit 90259fed2ecc0b21a41e997bd4812aa845b79dfb
Merge: 3b01dac cd7e2a6
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Tue Jun 9 18:26:07 2015 +0200

    Merge pull request #12031 from jlhawn/build_cache_ignore_mtime

    Make build cache ignore mtime

commit 3b01dac44d0095c31354c0f58e5ff26bf6ef12f2
Merge: 7f6aa3b f4a3e8b
Author: James Turnbull <james@lovedthanlost.net>
Date:   Tue Jun 9 04:56:35 2015 -0400

    Merge pull request #13814 from duglin/DocTweak

    Fix COPY/ADD quoted/json form

commit 73bc885b23fb06b6d9d6cb554fde93fe0e6bcb98
Author: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date:   Tue Jun 9 13:47:31 2015 +0800

    daemon: cleanup getting container logic

    Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

commit 2b4facdf2ed6b1074a2a8abc031bf0827b6d5f33
Author: Jörg Thalheim <joerg@higgsboson.tk>
Date:   Mon Apr 20 12:21:21 2015 +0200

    hack: explicit bundles for integration-cli prequisites

    no longer load hide critical code such as in .integration-daemon-{start,stop},
    if this step failed, it will had logged the corresponding module before:

    ---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)

    which is nicer to debug.

    This will make it also easier to execute a single tests in an interactive shell.

    $ make shell
    docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
    docker> docker ps
    CONTAINER ID        IMAGE               COMMAND             CREATED STATUS              PORTS               NAMES
    docker> go test github.com/docker/docker/integration-cli

    Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>

commit 7f6aa3b783620065281493a88ac1cc2a1833b93d
Merge: 5e0e71b a31be25
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Mon Jun 8 20:38:30 2015 -0700

    Merge pull request #13816 from xiekeyang/remove

    Registry: remove unwanted return variable name

commit a31be2512136444ce473235a35d6fd47634e3f13
Author: xiekeyang <xiekeyang@huawei.com>
Date:   Tue Jun 9 10:07:48 2015 +0800

    Registry: remove unwanted return variable name

    Signed-off-by: xiekeyang <xiekeyang@huawei.com>

commit 5e0e71bbe0cdb2dd23abee130b6ca7887c02731a
Merge: a2ab067 d0c4c7c
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 17:20:33 2015 -0700

    Merge pull request #13714 from flavio/add-suse-support-to-docker-installer

    Added openSUSE and SUSE Linux Enterprise support to install.sh

commit 123a0582b2f9522bdfb95cceabf8dd21af758300
Author: Tibor Vass <tibor@docker.com>
Date:   Mon Jun 8 19:56:37 2015 -0400

    Do not set auth headers if 302

    This patch ensures no auth headers are set for v1 registries if there
    was a 302 redirect.

    This also ensures v2 does not use authTransport.

    Signed-off-by: Tibor Vass <tibor@docker.com>

commit f4a3e8bef0070af6ad883fd06e504a8b1d4c93ba
Author: Doug Davis <dug@us.ibm.com>
Date:   Mon Jun 8 16:29:12 2015 -0700

    Fix COPY/ADD quoted/json form

    Minor tweak to the quoted/json form and made man page look like the Dockerfile
    docs.  W/o the `,` people may think there should be a space delimited list.

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit a2ab067b3c56f6b296150531c94a05b357fc0d70
Merge: 75f6349 fd935ee
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 15:16:10 2015 -0700

    Merge pull request #13022 from Microsoft/10662-addrsrc

    Windows: Add resources for manifest and icon

commit 75f63499a05ecd6511b468b666973ed9d38037ae
Merge: 4ad05ed a121ac8
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 15:15:49 2015 -0700

    Merge pull request #12992 from aidanhs/aphs-easy-debug-build

    Allow passing DOCKER_DEBUG= to `make`

commit 9a9dc5ba96d2661f5dc2037db44d0984d2129946
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Apr 27 07:53:12 2015 -0700

    Windows: Don't build Linux graph drivers

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 4ad05ed9859614203708eec3d3a1ecf0cc81e17a
Merge: 969cb54 71eadd4
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 8 15:02:47 2015 -0700

    Merge pull request #13808 from Microsoft/10662-volumefixcompile

    Windows: Fix PR13278 compile break

commit 969cb545ae5022dc38113f741f2ba3f873cfb967
Merge: c69d3b7 8bfc810
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Mon Jun 8 14:43:17 2015 -0700

    Merge pull request #13546 from hqhq/hq_checkconfig_rescount

    Don't check RESOURCE_COUNTERS in new kernel

commit c69d3b749dfa19ed0e899c1f7ac5eff8212a9ccf
Merge: b099eb7 ae68dfe
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Mon Jun 8 14:24:32 2015 -0700

    Merge pull request #13790 from jfrazelle/update-authors-mailmap

    update authors and mailmap

commit cd7e2a6b2b529cb4180926352a3fe9e82040d073
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Mon Jun 8 11:42:00 2015 -0700

    [docs] Update builder docs on last-modified times

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 0e10507a1c5985e6fda0ff48e9313ba7a4de761b
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Thu Apr 2 10:42:40 2015 -0700

    [builder] Make build cache ignore mtime

    Build cache uses pgk/tarsum to get a digest of content which is
    ADD'd or COPY'd during a build. The builder has always used v0 of
    the tarsum algorithm which includes mtimes however since the whole
    file is hashed anyway, the mtime doesn't really provide any extra
    information about whether the file has changed and many version
    control tools like Git strip mtime from files when they are cloned.

    This patch updates the build subsystem to use v1 of Tarsum which
    explicitly ignores mtime when calculating a digest. Now ADD and
    COPY will result in a cache hit if only the mtime and not the file
    contents have changed.

    NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
    function. It is a best-effort approach to determining if two sets of
    filesystem content are different.

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 71eadd4176a968399671e5cb4c8de52c40992b01
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Jun 8 13:45:28 2015 -0700

    Windows: Fix PR13278 compile break

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b099eb796a54276ea6585d9647b274d296a83aed
Merge: 875eafb dbf5e36
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 8 09:36:36 2015 -0700

    Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file

    Fix docs URL in systemd service file.

commit 875eafb00b07411e361993d256adf8f459d1bafa
Merge: c622ca6 bf6492e
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Mon Jun 8 17:08:37 2015 +0200

    Merge pull request #13713 from draghuram/manport

    Fix examples in "docker port" man page.

commit bf6492e689e2cb375fe6b39327dbe0655452640a
Author: Raghuram Devarakonda <draghuram@gmail.com>
Date:   Wed Jun 3 15:50:06 2015 -0400

    Fix examples in "docker port" man page.

    Closes #13667.

    Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>

commit c622ca6d4b6575d6711a2c8340f5119730a1b8f9
Merge: a63c7c7 68bfd9e
Author: James Turnbull <james@lovedthanlost.net>
Date:   Mon Jun 8 08:57:13 2015 -0400

    Merge pull request #13797 from eolamey/13796-tiny-systemd-docs-improvements

    Tiny improvements to systemd docs.

commit 68bfd9e3aea088b644c058be77b5fa24bbdea7f9
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Mon Jun 8 04:28:45 2015 +0000

    Tiny improvements to systemd docs.

    Show how to use `systemctl show` and recommend against modifying
    system unit files in `/usr` and `/lib`.

    Fixes #13796.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit dbf5e36fd6257ed237f76a65ccbae4124a4f0bdf
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Mon Jun 8 10:14:35 2015 +0000

    Fix docs URL in systemd service file.

    Fixes #13799.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit a63c7c7be678880fb5c11f3c9cb7b3029d132b7f
Merge: 5d22afc 67552fb
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Sun Jun 7 23:01:39 2015 -0700

    Merge pull request #13582 from coolljt0725/remove_useless_code

    Cleanup: remove some useless code

commit c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Author: Jana Radhakrishnan <mrjana@docker.com>
Date:   Fri Jun 5 15:02:56 2015 -0700

    libnetwork: Add garbage collection trigger

    When the daemon is going down trigger immediate
    garbage collection of libnetwork resources deleted
    like namespace path since there will be no way to
    remove them when the daemon restarts.

    Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

commit 67552fb22d254ba5e515aa899b1da3173f474a14
Author: Lei Jitang <leijitang@huawei.com>
Date:   Sat Jun 6 14:00:33 2015 +0800

    Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting

    Signed-off-by: Lei Jitang <leijitang@huawei.com>

commit 5d22afc54e21677dc3bf5e0f0283aff9d8892701
Merge: 07b22fc 54ac3d9
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Sun Jun 7 16:57:54 2015 -0400

    Merge pull request #13795 from michael-k/daemonFolder

    [integration-cli] Made doc consistent with code

commit 54ac3d9c76df3bbbb54b85b58a503cc1d6155f01
Author: Michael Käufl <docker@c.michael-kaeufl.de>
Date:   Sun Jun 7 22:32:29 2015 +0200

    Made doc consistent with code

    The name of the folder was shortened in a1ea562

    Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>

commit 07b22fcf50f0156a5a15d5392a7dcb340b493f34
Merge: 3c37a30 4ce8177
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Sun Jun 7 12:28:41 2015 -0400

    Merge pull request #13787 from runcom/check-nil-Config

    Avoid nil pointer dereference while creating a container with an empty Config

commit 3c37a307bcd67bbb3f1b0333dd30eb45b1650492
Merge: 3d10540 173d091
Author: James Turnbull <james@lovedthanlost.net>
Date:   Sun Jun 7 09:25:15 2015 -0400

    Merge pull request #13791 from eolamey/minor-docs-fixes

    Fix a typo and a minor formatting issue in the docs.

commit 173d0918a8ddffe1ba8a057527feccb6bee7f30b
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Sun Jun 7 07:07:04 2015 +0000

    Fix a typo and a minor formatting issue in the docs.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit ae68dfe31b641a1dad7e3072ed2413dc32cfcd32
Author: Jessica Frazelle <princess@docker.com>
Date:   Sat Jun 6 21:38:49 2015 -0700

    update authors and mailmap

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 3d10540bc330ec0a99229e2a943ae04a0f8b38c9
Merge: 3c132ff 5fa6014
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Sat Jun 6 16:02:59 2015 -0700

    Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please

    Restore --default-gateway{,-v6} daemon options.

commit 4ce817796e639391f6bc3e338f5a88985daacaca
Author: Antonio Murdaca <runcom@linux.com>
Date:   Sat Jun 6 18:41:42 2015 +0200

    Avoid nil pointer dereference while creating a container with an empty Config

    Signed-off-by: Antonio Murdaca <runcom@linux.com>

commit 3c132ff62d49247abed25a5686611bcac6801b23
Merge: ffd74e7 d32e01b
Author: James Turnbull <james@lovedthanlost.net>
Date:   Sat Jun 6 08:50:27 2015 -0400

    Merge pull request #13764 from bcexelbi/bexelbie_man_typo

    Fixing typo in Dockerfile manpage

commit ffd74e74b19cf402f7d9a98fe77790c4a79655da
Merge: f208639 3fcf53d
Author: moxiegirl <mary@docker.com>
Date:   Fri Jun 5 18:41:37 2015 -0700

    Merge pull request #13776 from duglin/MinorVolDocEdit

    Minor doc edit to add clarity around the --volume path format

commit c0b44218196ab597d22eb6344e8770fdee73067b
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 18:07:41 2015 -0700

    Update graph to use digest type

    Update get and set functions to use digests.
    Update push code to use the digest type instead of string

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit bb50a4159bda8e6f2d47b69ddd476ab32ac6be14
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 15:32:31 2015 -0700

    Update graph walkhistory to pass by value

    Remove unused graph history function

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit 2b58b677a54950bc78c13760ef79fe6284154847
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 15:31:10 2015 -0700

    Separate graph from image

    Move graph related functions in image to graph package.
    Consolidating graph functionality is the first step in refactoring graph into an image store model.
    Subsequent refactors will involve breaking up graph into multiple types with a strongly defined interface.

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit f20863929b3ca7c6a2735200404ec8af8fd6ebbf
Merge: 7c64ed5 ff9877c
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 15:43:55 2015 -0700

    Merge pull request #13778 from LK4D4/rename_file

    Rename test file to have _test postfix

commit 3fcf53db920de9d9111a86bd0eda90a059885754
Author: Doug Davis <dug@us.ibm.com>
Date:   Fri Jun 5 12:42:48 2015 -0700

    Minor doc edit to add clarity around the --volume path format
    Also add a comment to the ValidatePath func so devs/reviewers
    know exactly what its looking for.

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit ff9877ccc4db4d0891583ebac6558a235b028942
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Fri Jun 5 13:49:52 2015 -0700

    Rename test file to have _test postfix

    Without this go test was unable to find line number of error in that
    file.

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit 7c64ed5c8c49d786d626f6a4704d868ae4662374
Merge: af29aff 77bd53a
Author: moxiegirl <mary@docker.com>
Date:   Fri Jun 5 13:36:33 2015 -0700

    Merge pull request #12573 from clnperez/doc-article-baseimage

    Update doc with usage of the scratch image

commit af29aff53c95ed2a478693b566cc93c19362cce8
Merge: 5c051e2 79621c7
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 13:25:34 2015 -0700

    Merge pull request #13772 from icecrime/13770_image_labels_to_containers

    Container don't inherit from image labels

commit 77bd53adfe6877acd1ff8f07cf148f1dbe0b425d
Author: Christy Perez <christy@linux.vnet.ibm.com>
Date:   Mon Apr 20 15:11:46 2015 -0500

    Update doc with usage of the scratch image

    The scratch image used to be a regular image, but as of
    commit 8936789919c5c8004f346f44a3452d1521818b60 it is a
    special case, and cannot be used with 'docker pull.'

    Update this doc to reflect the new behavior and clear up
    confusion surrounding this image.

    Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>

commit 79621c7728ab83292ffd94d005f10ccebfba055b
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 5 10:56:25 2015 -0700

    Container don't inherit from image labels

    Labels are metadata that apply to a particular resource: image,
    container, maybe volumes and networks in the future. We shouldn't have
    containers inherit from its image labels: they are not the same obejcts,
    and labels cannot be interpreted in the way.

    It remains possible to apply metadata to an image using the LABEL
    Dockerfile instruction, to query them using `docker inspect <img>`, or
    to filter images on them using `docker images --filter <key>=<value>`.

    Fixes #13770.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 5c051e2e263955788809819c37a4a3b9142247ed
Merge: 078b8e5 b180de5
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 10:46:31 2015 -0700

    Merge pull request #13767 from duglin/TweakInNetOpts

    Remove duplicate call to net.ParseIP

commit 078b8e54e4429f838ff26ddace34854167fe0b42
Merge: efe5c64 0adfb90
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Fri Jun 5 10:27:58 2015 -0700

    Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh

    fix lxc build

commit efe5c647684d8050ed174e0984d07de0f8489bbd
Merge: 69c2f56 bfed4b7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 5 10:16:24 2015 -0700

    Merge pull request #13636 from tiborvass/refactor-tls

    Refactor TLS code with a new `tlsconfig` package

commit 69c2f5649a135835d5ea8e519a4f1b37f9d7127f
Merge: edb7e84 d8680f7
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Fri Jun 5 19:11:51 2015 +0200

    Merge pull request #13748 from icecrime/experimental_docs

    Minor changes to experimental docs

commit 0adfb908a682e679b54f511fe89e668d6e676dda
Author: Jessica Frazelle <princess@docker.com>
Date:   Fri Jun 5 09:14:19 2015 -0700

    fix lxc build

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit b180de55caa382fd6ced4488d68392edd1d34da0
Author: Doug Davis <dug@us.ibm.com>
Date:   Fri Jun 5 09:44:10 2015 -0700

    Remove duplicate call to net.ParseIP
    and a little cleanup

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Author: Tibor Vass <tibor@docker.com>
Date:   Thu May 7 09:49:07 2015 -0700

    Refactor TLS code with a new `tlsconfig` package

    This patch creates a new `tlsconfig` package to handle creation of
    secure-enough TLS configurations for clients and servers.

    The package was created by refactoring TLS code in the client and the
    daemon. After this patch, it is expected that all code creating TLS
    configurations use this `tlsconfig` package for greater security,
    consistency and readability.

    On the server side, this fixes a bug where --tlsverify was not taken
    into account. Now, if specified, it will require the client to
    authenticate.

    Signed-off-by: Tibor Vass <tibor@docker.com>

commit edb7e84ddbe8df4767e7249c76551ce69d68e8f4
Merge: 159f5e0 0c84604
Author: Phil Estes <estesp@gmail.com>
Date:   Fri Jun 5 11:43:47 2015 -0400

    Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs

    Fix goroutine leak on logs -f with no output

commit d32e01be1ae7e72b4d9e4a6aeb462c60a8dc299c
Author: Brian (bex) Exelbierd <bexelbie@redhat.com>
Date:   Fri Jun 5 16:33:11 2015 +0200

    Fixing typo in Dockerfile manpage

    Signed-off-by: Brian Exelbierd <bex@pobox.com>

commit 159f5e01377bd55d3bbc63dea759afb5503542b4
Merge: cd1a1ee 9ed2cb3
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Fri Jun 5 21:07:57 2015 +1000

    Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5

    Bring over DHE docs updates for publishing

commit 9ed2cb300b255842a3d318a112784b806c1bf8e7
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Fri Jun 5 21:06:59 2015 +1000

    Bring over DHE docs updates for publishing

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Fri Jun 5 05:57:59 2015 +0000

    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>

commit ed39fbeb2ad3959f37cf6c16aaf30aacb3292817
Author: Samuel Karp <skarp@amazon.com>
Date:   Wed Jun 3 12:01:53 2015 -0700

    Adjust disallowed CpuShares in /containers/create

    Previous versions of libcontainer allowed CpuShares that were greater
    than the maximum or less than the minimum supported by the kernel, and
    relied on the kernel to do the right thing. Newer libcontainer fails
    after creating the container if the requested CpuShares is different
    from what was actually created by the kernel, which breaks compatibility
    with earlier Docker Remote API versions. This change explicitly adjusts
    the requested CpuShares in API versions < 1.20.

    Signed-off-by: Samuel Karp <skarp@amazon.com>

commit cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Merge: e33aeac 4572329
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 4 16:37:59 2015 -0700

    Merge pull request #13752 from tianon/fix-release-debs

    Fix release script to release _both_ .deb files

commit e33aeac70892b2088442fc146fb16ab59b4eb58c
Merge: a06e0bb 22b195f
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 4 16:09:24 2015 -0700

    Merge pull request #13640 from Microsoft/10662-implementmeminfo

    Windows: Implement ReadMemInfo()

commit 4572329d4b1d7b4f9cb638961a299f79443506bb
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Thu Jun 4 15:51:12 2015 -0700

    Fix release script to release _both_ .deb files

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit a06e0bb8b49819402180331d325d919f865a5fbd
Merge: a2602c6 78bc233
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 5 00:42:22 2015 +0200

    Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output

    registry: debugTransport should print with testing.T.Log

commit a2602c617d0afcf829983c46abd9cc95f2003078
Merge: b63ec6e 8b4c0de
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 15:39:31 2015 -0700

    Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info

    Cleanup Daemon.verifyVolumesInfo() a bit

commit 0c84604f5458bc38b793e5bcdf86624eef3e3184
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 12:15:33 2015 -0700

    Fix goroutine leak on logs -f with no output

    Also noticed potential hang when only stdout or stderr are used with
    follow=1

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 543cf79ffba276fe90ff9eb3a85adb4a53e31366
Author: John Howard <jhoward@microsoft.com>
Date:   Thu Jun 4 10:29:57 2015 -0700

    Add GOOS in User-Agent

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Merge: b264282 ea180a7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 12:05:47 2015 -0700

    Merge pull request #13734 from aboch/master

    Fix for #13720. Unpublished ports missing in docker ps

commit fd935ee63db31e73b5ee5594644e04b959ead374
Author: John Howard <jhoward@microsoft.com>
Date:   Wed May 6 08:41:17 2015 -0700

    Windows: Build docker.exe manifested and with icon

    Signed-off-by: John Howard <John.Howard@microsoft.com>

commit b26428257f211f21f0f93d27d0ea74531cda9047
Merge: 7c2178b 16a5590
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Thu Jun 4 11:14:34 2015 -0700

    Merge pull request #13728 from calavera/copy_old_volume_content

    Migrate data from old vfs paths to new local volumes path.

commit 7c2178b3582729489f09fdce6aee28d2238ac047
Merge: cbe120d 318defe
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Thu Jun 4 11:10:55 2015 -0700

    Merge pull request #13736 from SvenDowideit/double-the-double-the-lines

    Tiny spelling issue in the debian control file :)

commit cbe120db587cddc8af9885e9ff2f2a69040deb4e
Merge: 9069cde 9ec5e4f
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Thu Jun 4 10:59:37 2015 -0700

    Merge pull request #13745 from icecrime/test_import_path

    Fix kr/pty import path in test-integration-cli

commit d8680f7beb84b036d2122739eda9ea79809a6f25
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 10:33:20 2015 -0700

    Remove reference to experimental release

    Remove reference to experimental releases as it is really a nightly
    channel rather than a scheduled release.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 8352f2e26451549217fa52fe03f8df556af3d8ca
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 10:32:50 2015 -0700

    Rename EXPERIMENTAL.md to README.md

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 16a5590c5be4be555a1ebe52d031d4e9e0e6da23
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 15:31:20 2015 -0700

    Migrate data from old vfs paths to new local volumes path.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 9069cded5761de31b786d70f269fa47732e3e5ed
Merge: 2c09dbb 112b7e6
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Thu Jun 4 10:05:01 2015 -0700

    Merge pull request #13586 from kvasdopil/zfs-88chars

    Avoid 88-chars mountpoint length limit on freebsd

commit 2c09dbb7ddab685d52a2748e6f78fc8e90ad4469
Merge: 4efedb3 d312247
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 4 09:21:53 2015 -0700

    Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir

    Don't forget to clenaup tmpdir in TestFileSpecPlugin()

commit 4efedb3fba49623de562b189a145c8334eaba609
Merge: ef3e956 95dfc4c
Author: moxiegirl <mary@docker.com>
Date:   Thu Jun 4 09:11:00 2015 -0700

    Merge pull request #13716 from moxiegirl/move-experimental

    Moving experimental

commit 9ec5e4f7df15f5c1e9862f71fe3079188fff0106
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 09:02:14 2015 -0700

    Fix kr/pty import path

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit d31224743b31b3e29ed7df0835193ff1ac4e723c
Author: Zefan Li <lizefan@huawei.com>
Date:   Thu Jun 4 13:21:28 2015 +0800

    Don't forget to clenaup tmpdir in TestFileSpecPlugin()

    Also remove redundant code.

    Signed-off-by: Zefan Li <lizefan@huawei.com>

commit 318defe1de8a9d2930d784306fd024c59e21a8c5
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Thu Jun 4 18:16:24 2015 +1000

    Tiny spelling issue in the debian control file :)

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit ea180a73bc00491915d620c14877318cc33b2a73
Author: Alessandro Boch <aboch@docker.com>
Date:   Wed Jun 3 22:47:08 2015 -0700

    Fix for #13720

    Signed-off-by: Alessandro Boch <aboch@docker.com>

commit ef3e956aa2c8b24fd18c7fa693b366be781fc30a
Merge: 57bba29 aa54a93
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 22:05:09 2015 -0700

    Merge pull request #13704 from tianon/build-utc

    Swap build-* to use UTC instead of local time

commit 57bba29f7910e0fe7d99ecb6375d7c56fd1812bf
Merge: f37e6e1 83208a5
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 21:40:15 2015 -0700

    Merge pull request #13732 from mavenugo/netdisabled

    Using container NetworkDisabled to fix #13725

commit 83208a531d1824ea7b0a55f9419e915e446c780a
Author: Madhu Venugopal <madhu@docker.com>
Date:   Wed Jun 3 17:31:22 2015 -0700

    Using container NetworkDisabled to fix #13725

    container.config.NetworkDisabled is set for both daemon's
    DisableNetwork and --networking=false case. Hence using
    this flag instead to fix #13725.

    There is an existing integration-test to catch this issue,
    but it is working for the wrong reasons.

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit f37e6e180f67db73e8db9f3eaebb84a42fc01914
Merge: fdd6175 229b599
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 17:24:53 2015 -0700

    Merge pull request #13731 from jfrazelle/fix-version-on-old-versions

    fix version struct on old versions

commit fdd6175bca8bcd2a189e18964ec3e92645ee73c3
Merge: babf751 6945ac2
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 17:14:58 2015 -0700

    Merge pull request #13718 from runcom/fix-containers-json

    SizeRW & SizeRootFs omitted if empty in /container/json call

commit 229b599259b24b30fdecbb70bdbba417a81e9723
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 3 16:56:09 2015 -0700

    fix version struct on old versions

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit babf751e1b96641ffd643b32394bf57e2de6c609
Merge: ca66419 fa02034
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 14:24:37 2015 -0700

    Merge pull request #13715 from LK4D4/update_logrus

    Update github.com/Sirupsen/logrus to 0.8.2

commit ca66419522a40b86ece75b0eb044d6d394acacec
Merge: ad56d79 7943bce
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 14:21:38 2015 -0700

    Merge pull request #13709 from jfrazelle/update-url

    Update urls from .com to .org.

commit 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Author: Antonio Murdaca <runcom@linux.com>
Date:   Wed Jun 3 23:13:56 2015 +0200

    SizeRW & SizeRootFs omitted if empty in /container/json call

    Signed-off-by: Antonio Murdaca <runcom@linux.com>

commit ad56d797d3cbac8d02fe2542f5673bbdd3d862b8
Merge: f18ce10 9e7fc24
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 13:43:39 2015 -0700

    Merge pull request #13712 from LK4D4/fix_leak_events

    Support CloseNotifier for events

commit 95dfc4c4a545c3ca35ad7582bbfe4a627bd6a5fc
Author: Mary Anthony <mary@docker.com>
Date:   Wed Jun 3 13:43:27 2015 -0700

    Moving experimental

    Signed-off-by: Mary Anthony <mary@docker.com>

commit 7943bce8942ee8c262180652951216d963fa6202
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 3 12:08:40 2015 -0700

    Update urls from .com to .org.

    I added 301 redirects from dockerproject.com to dockerproject.org but may as
    well make sure everything is updated anyways.

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit fa020341e46cfe127b1e1124aa482651aecde359
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Wed Jun 3 13:21:58 2015 -0700

    Update github.com/Sirupsen/logrus to 0.8.2

    Fix #13708

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit f18ce101fbdf6c62a5643f826ed69a8abb843d87
Merge: a29633f 4e3b21f
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Wed Jun 3 22:14:42 2015 +0200

    Merge pull request #13165 from ahmetalpbalkan/durations

    Allow duration strings as --since/--until

commit d0c4c7c83f4882dc704a8089029a012e9b1a9a36
Author: Flavio Castelli <fcastelli@suse.com>
Date:   Wed Jun 3 21:50:36 2015 +0200

    Added openSUSE and SUSE Linux Enterprise support to install.sh

    Handle docker installation on openSUSE and SUSE Linux Enterprise
    via https://get.docker.io/

    Signed-off-by: Flavio Castelli <fcastelli@suse.com>

commit a29633f6878369081dcdb9886ca7e24a082d0393
Merge: b301219 725f341
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 12:30:12 2015 -0700

    Merge pull request #13703 from runcom/13691-container-ps-regression

    Do not omit empty json field in /containers/json api response

commit b30121984e500ce7555a0aa10cdf17b2a5261cf4
Merge: c962f53 a448b7a
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Wed Jun 3 21:24:13 2015 +0200

    Merge pull request #13702 from BenSeverson/patch-1

    quick doc fix for windows versions

commit c962f53a3e66dcfaf6c335df805d99cb5784245f
Merge: 521926f 4fde1cb
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 12:05:43 2015 -0700

    Merge pull request #13645 from calavera/fix_stats_flaky_test

    Fix stats flaky test.

commit 9e7fc245a79535984c3e0dd3d2c4f042e92cdc6a
Author: Alexander Morozov <lk4d4@docker.com>
Date: …

tagomoris added a commit to tagomoris/docker that referenced this pull request Jun 20, 2015

Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

Squashed commit of the following:

commit bb2d681b91bdd5f284da86d90560240acc4f3987
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Tue Jun 16 13:03:00 2015 +0900

    Fix to try to reconnect almost forever (204 years)

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit edc54fb2667ddc243b312046ede6392566309815
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Fri Jun 5 12:44:30 2015 +0900

    Fix code styles with review comments

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit 7fef8788462aa3f5c31f90026e17398eace14796
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Thu Jun 4 10:48:52 2015 +0900

    Add logging driver "fluentd"

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit d5551baa5d6ac41f0850a443555d0de1ecfb18d9
Author: TAGOMORI Satoshi <tagomoris@gmail.com>
Date:   Thu Jun 4 10:47:50 2015 +0900

    Add libraries for fluentd logging driver

    Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>

commit 9dffd032f43dca88e8a66685aceb21b0e00cc232
Merge: b81f2ee 59cfc08
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Mon Jun 15 21:41:12 2015 -0400

    Merge pull request #13950 from Microsoft/10662-vfsforreal

    Windows - Really fix VFS this time

commit b81f2ee5f20d094c13893f565ce716595c539d22
Merge: f48fadd ff4e58f
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 17:13:44 2015 -0700

    Merge pull request #13953 from crosbymichael/network-mtu

    Get Mtu from default route

commit ff4e58ff560d864432261a68502a8a5543145fdf
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 15 16:33:02 2015 -0700

    Get Mtu from default route

    If no Mtu value is provided to the docker daemon, get the mtu from the
    default route's interface.  If there is no default route, default to a
    mtu of 1500.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit f48fadd05c5e131757ae305693e5b3ccbc539736
Merge: 4d23f45 6578ad9
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 15 16:19:38 2015 -0700

    Merge pull request #13941 from unclejack/fix_umask

    docker/daemon: set umask to the default on startup

commit 4d23f459adb26deced2843ebb223bd16b5ba3b42
Merge: 748814a dcc4a14
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 16:16:02 2015 -0700

    Merge pull request #13947 from mavenugo/vin

    Picking up missed out vendor files via hack/vendor.sh

commit 748814a97a0bade1375ffa9cee6009a823b6d75e
Merge: 835f1c9 dfec4a4
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 15 16:12:22 2015 -0700

    Merge pull request #13935 from asbjornenge/tm_syntax_updates

    TM syntax updates

commit 59cfc089820f6f8a2a5f24ddfcf0fe1328c9568c
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Jun 15 15:08:36 2015 -0700

    Windows - Really fix VFS this time

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 835f1c91161db45ed18683b5d75685dea0c5dc2c
Merge: 86d6a5b 20927ff
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Mon Jun 15 23:56:32 2015 +0200

    Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container

    Correct the message of pause and unpause a non-running container

commit 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Merge: b3b04fd 4cb0c93
Author: Josh Hawn <jlhawn@berkeley.edu>
Date:   Mon Jun 15 14:50:17 2015 -0700

    Merge pull request #13869 from jlhawn/multi_line_help_usage

    api/client: Allow for multi-line usage help

commit b3b04fd85a5a44182c872a2765e6732bf9f05a39
Merge: d409b05 a98ea87
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Mon Jun 15 14:37:30 2015 -0700

    Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull

    Store layer digests on pull

commit d409b05970e686993e343d226fae5b463d872082
Merge: 3f11e05 f93fee5
Author: moxiegirl <mary@docker.com>
Date:   Mon Jun 15 13:57:12 2015 -0700

    Merge pull request #13936 from moxiegirl/test-tooling

    Updated retooling for Hugo to go out with 1.7

commit f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Author: Mary Anthony <mary@docker.com>
Date:   Sun Jun 7 20:07:20 2015 -0700

    retooling for hugo
    Tweaking for Hugo
    Updating the Dockerfile with new sed; fix broken link on Kitematic
    Fixing image pull for Dockerfile
    Removing docs targets

    Signed-off-by: Mary Anthony <mary@docker.com>

commit dcc4a14ba31ab195f97dcf264835339a1a00e8d5
Author: Madhu Venugopal <madhu@docker.com>
Date:   Mon Jun 15 11:38:06 2015 -0700

    Picking up missed out vendor files via hack/vendor.sh

    while wokring on another PR, I noticed that hack/vendor.sh was picking
    up unrelated files. Maybe a previous update to the hack/vendor.sh failed
    to run the script and push the vendor changes ?

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Merge: 1157fcc d8592ea
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 15 11:25:35 2015 -0700

    Merge pull request #13942 from calavera/fix_unshare_mount_regression

    Fix regression bind mounting shared.

commit a98ea87e463383a77d7244c78c9da3ac9f2cd086
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Mon Jun 15 11:06:21 2015 -0700

    Store layer digests on pull

    Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
    This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.

    Fixes #13883

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit d8592eaff8bddb6f29c48cc39dec70db884eda00
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 15 10:34:59 2015 -0700

    Revert "contrib/init: unshare mount namespace for inits"

    This reverts commit b6569b6b82df4c5e29ee8f5ebd9db7e36919cefd.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 1157fcc4a4e775a0b6f2dfc9c0c25fcbc453e1a8
Merge: 637023a c7975f1
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Mon Jun 15 10:17:24 2015 -0700

    Merge pull request #13926 from Microsoft/10662-createfixup

    Windows: Fixup compile in daemon_windows.go

commit 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Merge: ee40f29 13f2aa7
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Mon Jun 15 16:25:59 2015 +0200

    Merge pull request #13502 from coolljt0725/conflict_port_and_netmode

    Add --net=container with --publish --expose --publish-all error out

commit 6578ad90c307c5500a7998819743be88f63ef2b3
Author: unclejack <unclejacksons@gmail.com>
Date:   Mon Jun 15 16:36:19 2015 +0300

    docker/daemon: set umask to the default on startup

    This sets up the umask so that it's the same on all systems.

    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit dfec4a48c7ac3ea4604b0a6d400109aa2004bad9
Author: Asbjørn Enge <asbjorn@hanafjedle.net>
Date:   Mon Jun 15 00:04:05 2015 +0200

    Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction

    Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)

commit ac8cbf4952cf745207dbd966109348bbb80c9ebd
Author: Asbjørn Enge <asbjorn@hanafjedle.net>
Date:   Mon Jun 15 00:02:10 2015 +0200

    Updated TextMate install instruction - this bundle is not included in TM :smile: :rocket

    Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)

commit ee40f297122b6998e35cf0992c96dd559ea41b26
Merge: f27c9bc cd44018
Author: moxiegirl <mary@docker.com>
Date:   Sat Jun 13 10:29:56 2015 -0700

    Merge pull request #13927 from moxiegirl/carry-13250

    Carry of PR #13520

commit f27c9bc6e79db23432e84287bbeae9b307e405d0
Merge: cd36b15 85f895c
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Sat Jun 13 12:43:45 2015 -0400

    Merge pull request #13895 from calavera/fix_get_env_split

    Correct getEnv split.

commit cd44018856be421497a35d96f88dd0eec42fae43
Author: Mary Anthony <mary@docker.com>
Date:   Sat Jun 13 09:21:50 2015 -0700

    Carry of PR #13520
    Removinig files

    Signed-off-by: Mary Anthony <mary@docker.com>

commit cd36b15ccb8561de95ee2e018baa778316da4423
Merge: 261af00 0cdc3b7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sat Jun 13 09:14:40 2015 -0700

    Merge pull request #13860 from jlhawn/cli_call_headers

    api/client: have cli.call() return headers

commit c7975f12d6bcdac2812554c4d9ec88820ffe0e61
Author: John Howard <jhoward@microsoft.com>
Date:   Sat Jun 13 09:10:54 2015 -0700

    Windows: Fixup compile in daemon_windows.go

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 261af00282fac3e37d1d0018f1a926b84641625d
Merge: f1ea3e5 0833001
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sat Jun 13 09:00:33 2015 -0700

    Merge pull request #13682 from mavenugo/ln_vin

    Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564

commit f1ea3e5c7462450dea4c260e4781dcc916f538da
Merge: 422fa7f b37832e
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Fri Jun 12 19:59:45 2015 -0700

    Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig

    Refactor verifyHostConfig: change to verifyConfigs and add verify config

commit b37832e353327481579cbe2709f63a34453bf83b
Author: Lei Jitang <leijitang@huawei.com>
Date:   Sat Jun 13 09:31:19 2015 +0800

    Add verify config to verifyContainerSettings

    Signed-off-by: Lei Jitang <leijitang@huawei.com>

commit 422fa7f0a6c27e73125dd1f25de02198033e313e
Merge: 39bf57e 543cf79
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 17:19:51 2015 -0700

    Merge pull request #13749 from Microsoft/adduseragent

    Add GOOS in User-Agent

commit 39bf57e085d3632b2f03b26a4b9dc900d88b164c
Merge: 6a7a757 c646e51
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Fri Jun 12 17:11:18 2015 -0700

    Merge pull request #13344 from hqhq/hq_fix_arm64_test

    Fix unit-test build error on ARM64

commit 6a7a7570bb50c3127931e012d19d10b8837d95ac
Merge: cd71c5e 0395661
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 17:05:34 2015 -0700

    Merge pull request #12833 from burke/faster-changes

    Optimize archive.ChangesDirs on Linux

commit 083300168fb0f42e022e9fa2ce47a7b2aac9967a
Author: Madhu Venugopal <madhu@docker.com>
Date:   Fri Jun 12 13:51:57 2015 -0700

    Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564

    This PR brings the vendored libnetwork code to
    3be488927db8d719568917203deddd630a194564, which pulls in quite a few
    fixes to support kvstore, windows daemon compilation fixes,
    multi-network support for Bridge driver, etc...

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit cd71c5ed43edd345a3d92548010c07b9584d1796
Merge: 421b9b6 0a529b6
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 12 15:40:20 2015 -0700

    Merge pull request #13836 from amylindburg/master

    Update plugins.md

commit 0a529b6e7ad33dc05a154861061cf498e1350516
Author: Amy Lindburg <amy.lindburg@docker.com>
Date:   Tue Jun 9 22:20:48 2015 -0700

    Update plugins.md

    Fixed broken link.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugins.md

    Some other broken links!

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugin_api.md

    FIxing broken links.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

    Update plugins_volume.md

    Fixing more links.

    Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

commit 421b9b685949f76c205457e70c3bd8fb951c5034
Merge: 5bddafe d2c5fcc
Author: David Calavera <david.calavera@gmail.com>
Date:   Fri Jun 12 13:48:22 2015 -0700

    Merge pull request #13916 from Microsoft/10662-compileserver

    Windows: Patch up compile after adjustCpuShares

commit d2c5fcc8d5ada5e2f33562ca9f7a9b05d0b01676
Author: John Howard <jhoward@microsoft.com>
Date:   Fri Jun 12 13:00:59 2015 -0700

    Windows: Patch up compile after adjustCpuShares

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 5bddafe16938ee4af4c1f3e7380e82a610a9242d
Merge: e7533d7 e5b7f61
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 12 20:24:31 2015 +0200

    Merge pull request #13912 from icecrime/13902_improve_test

    Replace "sleep" by "top" in test implementation

commit e7533d7f81fdb3d33efd91c751d25b9d3b80f4e1
Merge: 27e2837 e89f837
Author: David Calavera <david.calavera@gmail.com>
Date:   Fri Jun 12 11:12:32 2015 -0700

    Merge pull request #13494 from Microsoft/10662-vfsdriveroption

    Windows: Allow VFS

commit 27e2837c6cd2c0d9b9ff9a0fda943a15b7162798
Merge: 2351557 855a056
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 12 19:53:18 2015 +0200

    Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp

    Fixes content-type/length for stats stream=false

commit e5b7f61f090bfc951590dd5dad3f6bb1ce3888ba
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 10:45:42 2015 -0700

    Replace "sleep" by "top" in test implementation

    Eliminate any chance of race condition by replacing a call to sleep by a
    call to top, and rely on test cleanup logic to have it exit cleanly.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 235155760788651cbde9eb9a6e0adca444a64267
Merge: 5a02d07 09de92b
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 10:42:07 2015 -0700

    Merge pull request #13902 from ibuildthecloud/api-fixes

    Set omitempty for IP and PublicPort to conform w/ API 1.18

commit 855a056af7829504ccc310587445c61d62427b51
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 11:27:39 2015 -0400

    Fixes content-type/length for stats stream=false

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 09de92b891c15bda593cf47617f032d2b0b40605
Author: Darren Shepherd <darren@rancher.com>
Date:   Fri Jun 12 09:49:53 2015 -0700

    Set omitempty for IP and PublicPort to conform w/ API 1.18

    Signed-off-by: Darren Shepherd <darren@rancher.com>

commit e89f837bc6a26e08e02f25b6e474d4ad7bdfb101
Author: John Howard <jhoward@microsoft.com>
Date:   Tue May 26 12:45:08 2015 -0700

    Windows: Allow VFS

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 5a02d0727bab071e270cf02521192a7d1d257b69
Merge: c98eafe f3d1826
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 12 07:27:07 2015 -0700

    Merge pull request #13899 from mavenugo/hp

    Vendoring in libnetwork to fix #13873.

commit c98eafe564b1828fb894749c33a8864257034af2
Merge: e70d680 a408790
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 09:37:53 2015 -0400

    Merge pull request #13906 from chenchun/closed_chan

    Fix send on closed channel bug

commit e70d680d72183c4ca3860436283a318037c844c8
Merge: 00b8fec d898372
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Jun 12 09:23:45 2015 -0400

    Merge pull request #13903 from dqminh/fix-cli-exec-output

    TestExecStopNotHanging: log output as string

commit f3d1826350d5624f1e82d764d2367a4584f04465
Author: Madhu Venugopal <madhu@docker.com>
Date:   Thu Jun 11 18:04:03 2015 -0700

    Vendoring in libnetwork to fix #13873.

    Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit a408790de8f317d79fb52acb3a5220846a0ffcba
Author: Chun Chen <chenchun.feed@gmail.com>
Date:   Fri Jun 12 15:42:34 2015 +0800

    Fix send on closed channel bug

    Signed-off-by: Chun Chen <chenchun.feed@gmail.com>

commit d898372568a3e00d4bda0359393d833a9f30fe1d
Author: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Date:   Thu Jun 11 22:53:55 2015 -0400

    TestExecStopNotHanging: log output as string

    When cmd failed, log its ouput as string instead of byte array to prevent test
    log like: [49 53 ....] exit status 1

    Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>

commit 00b8fec75f3a113c851013e0f0d559cc6d96b84d
Merge: 71ead0e c0b4421
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 11 17:44:37 2015 -0700

    Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation

    refactor: separate graph from image

commit 85f895ce681ebbc3a1990ef73875cf94b5c77d17
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 11 14:33:51 2015 -0700

    Correct getEnv split.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Merge: 0de7065 ed39fbe
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 11 14:20:50 2015 -0700

    Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI

    Adjust disallowed CpuShares in /containers/create

commit 0de7065897573551bb23ead8d1d21d22e7657f17
Merge: 98391f0 5d51118
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 14:12:17 2015 -0700

    Merge pull request #13801 from bexelbie/bex_manpage_indention

    Updates man page generation to use go-md2man v1.0.2

commit 98391f0a39e5696df0f5e7fd59be0b7f158d0564
Merge: cada9b5 566466e
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 13:22:03 2015 -0700

    Merge pull request #13890 from moxiegirl/vieux-fix

    Updating with fix for first line and the vieux/amy comment on website

commit 566466e71402b1d75412061d6ee80b07bb8e37b1
Author: Mary Anthony <mary@docker.com>
Date:   Thu Jun 11 12:48:01 2015 -0700

    Updating with fix for first line and the vieux/amy comment on website

    Signed-off-by: Mary Anthony <mary@docker.com>

commit cada9b54b52246fd284e3025da5ad936a7521c1c
Merge: e3821fe 19c31a7
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 12:42:06 2015 -0700

    Merge pull request #13865 from Mic92/zfs-selinux

    zfs: correctly apply selinux context

commit e3821feb137a81683f1763cc64b85d47ad4545bf
Merge: b27f960 b0d7483
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 11 10:32:53 2015 -0700

    Merge pull request #13783 from tianon/vendor-pruning

    Add intelligent vendor pruning (via "go list")

commit b0d748325f1eaae8d4f138b5785307cef2a784d3
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 15:07:23 2015 -0700

    Update "vendor/"

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit 9e4ee3dea52ec0615f59c729ed972d08732a3edd
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 14:47:27 2015 -0700

    Add intelligent vendor pruning (via "go list")

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit f61d595b55b48428b7268b85a23b6e61b649f6d9
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Jun 5 15:20:04 2015 -0700

    Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit b27f9605043377b46ecd7b983bea0e46da78cab7
Merge: 9001c4b 9ad8928
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Thu Jun 11 09:30:52 2015 -0700

    Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string

    Display empty string instead of <nil> when IP opt is nil.

commit 9001c4bc486934f91d5809b335232875e639dafb
Merge: 4fc6449 212dfb4
Author: moxiegirl <mary@docker.com>
Date:   Thu Jun 11 08:59:35 2015 -0700

    Merge pull request #13839 from eolamey/13838-fix-docs-url

    Fix docs URL not using https.

commit 4fc6449944901d0c696ddeb296434871d196ec20
Merge: ef171af 386ab25
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 11 09:12:34 2015 -0400

    Merge pull request #13861 from mrjana/cnm_integ

    Vendoring libnetwork to fix stale arp cache issue

commit 9ad89281aeb31d251f97af7ea419d5ca865b8199
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Thu Jun 11 07:53:39 2015 +0000

    Display empty string instead of <nil> when IP opt is nil.

    Fixes #13878.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit ef171afdbb8b766216eb87be51afe6243820a266
Merge: 2b27fe1 e2c6a8b
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Thu Jun 11 05:12:45 2015 -0400

    Merge pull request #13590 from mountkin/fix-archive-tests

    Add the parent directory to changes set if new files are generated

commit 19c31a703fb84f1079cc2466d435cb4913a4bfd2
Author: Jörg Thalheim <joerg@higgsboson.tk>
Date:   Thu Jun 11 00:34:18 2015 +0200

    zfs: correctly apply selinux context

    fixes #13858

    Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>

commit 5d51118c7c6399ed3002e6c19d860e89be79d160
Author: Brian (bex) Exelbierd <bexelbie@redhat.com>
Date:   Mon Jun 8 14:30:33 2015 +0200

    Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4

    The main Dockerfile to was updated - this update brings the
    sub-directory specific file inline with it.

    Fixes #12866

    Signed-off-by: Brian Exelbierd <bex@pobox.com>

commit 2b27fe17a1b3fb8472fde96d768fa70996adf201
Merge: 883d661 141cd2a
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Thu Jun 11 07:13:19 2015 +0200

    Merge pull request #13862 from Microsoft/10662-fixelementsrestored

    Show actual number of elements restored

commit 212dfb45dec64b470307aec22623f2d80be6695f
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Wed Jun 10 06:13:11 2015 +0000

    Fix docs URL not using https.

    Fixes #13838.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit 386ab251372a40e895115e7a927d349412cf9d89
Author: Jana Radhakrishnan <mrjana@docker.com>
Date:   Wed Jun 10 15:15:18 2015 -0700

    Vendoring libnetwork to fix stale arp cache issue

    Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

    Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

commit 883d661b693fceab343d764366731c165e360d50
Merge: ad9080a 0964a66
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 10 17:05:41 2015 -0700

    Merge pull request #13867 from calavera/fix_daemon_cleanup_order

    Cleanup driver and graph db after stopping containers.

commit ad9080a87c847121897f4d00dcde4541d392dd7c
Merge: 466efeb f88e620
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 16:55:15 2015 -0700

    Merge pull request #13868 from jfrazelle/update-gitignore-man

    update gitignore for new manpages

commit 0cdc3b7539b618778becf233157604698b4e8281
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Wed May 13 18:36:36 2015 -0700

    api/client: have cli.call() return headers

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 4cb0c93f9287d29934894c871d156801122516cd
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Wed May 13 19:45:01 2015 -0700

    api/client: Allow for multi-line usage help

    Subcommands can provide multiple usage synopses.

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 0964a664e85c88568863df30f43b0e3974093348
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 16:07:53 2015 -0700

    Cleanup driver and graph db after stopping containers.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit f88e620359eaf986a843714126a9a7df5e25e115
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 10 16:11:15 2015 -0700

    update gitignore for new manpages

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 466efebf0e9c41740316ec66c63ec6c7d64f9f57
Merge: b6049b5 84aec1e
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Wed Jun 10 15:57:37 2015 -0700

    Merge pull request #13863 from Microsoft/typoclientutils

    Typo fix in api\client\utils.go

commit 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Author: John Howard <jhoward@microsoft.com>
Date:   Wed Jun 10 15:24:53 2015 -0700

    Typo fix in api\client\utils.go

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 141cd2a1f26f3455a1daf20420ca1efb5a9e1a16
Author: John Howard <jhoward@microsoft.com>
Date:   Wed Jun 10 15:18:51 2015 -0700

    Show actual number of elements restored

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b6049b5c4963bb1b82ba381cdce69d1083bcf59e
Merge: 9da65ed eacae64
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 15:04:19 2015 -0700

    Merge pull request #13804 from moxiegirl/proposal-man-pages

    PROPOSAL: Moving man pages out of docs

commit 9da65ed84f9fc285fa2d122c8341a897e5d0eb29
Merge: add64dc c9d7131
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 10 14:12:14 2015 -0700

    Merge pull request #13854 from crosbymichael/revert-shared-root

    Revert shared container rootfs

commit eacae64bd89ccc95a6db7bda76d36014e71e70ac
Author: Mary Anthony <mary@docker.com>
Date:   Mon Jun 8 10:48:20 2015 -0700

    Moving man pages out of docs
    Adding in other areas per comments
    Updating with comments; equalizing generating man page info
    Updating with duglin's comments
    Doug is right here again;fixing.

    Signed-off-by: Mary Anthony <mary@docker.com>

commit add64dc297a4549e1abe0e0c5176eeabd198fb47
Merge: 05644cc 416e855
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Wed Jun 10 16:38:07 2015 -0400

    Merge pull request #13832 from mapk0y/fix-error-msg

    fix typo.

commit 05644ccea9910179274ffc9e587a8787fe9cceae
Merge: 17324c9 8fb0ca2
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Wed Jun 10 16:28:56 2015 -0400

    Merge pull request #13272 from Microsoft/10662-daemonrefactorv2

    Windows: Refactor daemon

commit 17324c91e33d43472f94188b25ee4bed49630e39
Merge: 65d0670 96d06e1
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 10 12:45:12 2015 -0700

    Merge pull request #13015 from mariussturm/master

    Add logging driver for GELF via UDP

commit 8fb0ca2c35c0df38a79c4eac62fd7d04e3688240
Author: John Howard <jhoward@microsoft.com>
Date:   Fri May 15 16:34:26 2015 -0700

    Windows: Refactor daemon

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Merge: 12149e8 c5f4988
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 10 11:53:47 2015 -0700

    Merge pull request #13853 from jfrazelle/fix-hack-make

    ugh typo in hack scripts fix, introduced by 2b4facdf

commit c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Wed Jun 10 11:29:27 2015 -0700

    Revert shared container rootfs

    This is breaking various setups where the host's rootfs is mount shared
    correctly and breaks live migration with bind mounts.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Author: Marius Sturm <marius@graylog.com>
Date:   Fri May 29 23:00:46 2015 +0200

    add UDP GELF logging-driver

    allows to send container logs to Graylog or Logstash.

    Signed-off-by: Marius Sturm <marius@graylog.com>

commit c5f49886fa1a7ce67ab020a19c4aea65225c3658
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 10 11:00:59 2015 -0700

    ugh typo in hack scripts fix, introduced by 2b4facdf

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 12149e829369e879a1978420b6ec2100a4b4fadd
Merge: 5821f13 74c12aa
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 10 10:34:13 2015 -0700

    Merge pull request #13754 from cpuguy83/13753_fix_events_64

    Default events since to current time

commit 74c12aa42918e3f349afcb46e6e54b724ef789a9
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 19:47:46 2015 -0700

    Default events since to current time

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 5821f13b8c8222ca75f5909236036222d175a25e
Merge: 46af724 e12839f
Author: James Turnbull <james@lovedthanlost.net>
Date:   Wed Jun 10 11:41:44 2015 -0400

    Merge pull request #13844 from ponsfrilus/master

    Typo psuedo - pseudo

commit 46af724e81fe6890dc2709101e3c3f680db77631
Merge: de90aef 35a7f0c
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Wed Jun 10 08:32:57 2015 -0700

    Merge pull request #12371 from rhatdan/kill

    docker kill should return error if container is not running.

commit de90aef4115c5a183e4d9406842562933aa93cf4
Merge: 55bdb51 9a9dc5b
Author: Tibor Vass <tiborvass@users.noreply.github.com>
Date:   Wed Jun 10 10:01:50 2015 -0400

    Merge pull request #12813 from Microsoft/10662-nolinuxgraph

    Windows: Don't build Linux graph drivers

commit e2c6a8be7c03d3c8405421c07ec6fb1c5c3a6200
Author: Shijiang Wei <mountkin@gmail.com>
Date:   Fri May 29 16:39:14 2015 +0800

    Add the parent directory to changes set if new files are generated

    The "TestChangesWithChanges" case randomlly fails on my development
    VM with the following errors:
    ```
    --- FAIL: TestChangesWithChanges (0.00s)
            changes_test.go:201: no change for expected change C /dir1/subfolder != A /dir1/subfolder/newFile
    ```

    If I apply the following patch to changes_test.go, the test passes.

    ```diff
    diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
    index 290b2dd..ba1aca0 100644
    --- a/pkg/archive/changes_test.go
    +++ b/pkg/archive/changes_test.go
    @@ -156,6 +156,7 @@ func TestChangesWithChanges(t *testing.T) {
            }
            defer os.RemoveAll(layer)
            createSampleDir(t, layer)
    +       time.Sleep(5 * time.Millisecond)
            os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)

            // Let's modify modtime for dir1 to be sure it's the same for the two layer (to not having false positive)
    ```

    It seems that if a file is created immediately after the directory is created,
    the `archive.Changes` function could't recognize that the parent directory of
    the new file is modified.

    Perhaps the problem may reproduce on machines with low time precision?
    I had successfully reproduced the failure on my development VM as well as
    a VM on DigitalOcean.

    Signed-off-by: Shijiang Wei <mountkin@gmail.com>

commit e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Author: Nicolas Borboën <ponsfrilus@users.noreply.github.com>
Date:   Wed Jun 10 13:22:27 2015 +0200

    Typo psuedo - pseudo

    Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>

commit 55bdb51659b3982ae78cd24ed0823f6b8d0bb9b2
Merge: 4750e1f bd9814f
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 19:51:06 2015 -0700

    Merge pull request #13699 from calavera/volume_backwards

    Allow to downgrade local volumes from > 1.7 to 1.6.

commit bd9814f0db9c8a087e42b66eabb8413bf1b2ab66
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 09:26:41 2015 -0700

    Allow to downgrade local volumes from > 1.7 to 1.6.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Merge: c3b962d c68e7f9
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Tue Jun 9 17:24:30 2015 -0700

    Merge pull request #13784 from mrjana/cnm_integ

    libnetwork: Add garbage collection trigger

commit c3b962d327d161171157b95d587946ebe5a5cfba
Merge: 13baeb3 38acd31
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 17:12:20 2015 -0700

    Merge pull request #13831 from LK4D4/update_libcontainer

    Update libcontainer to v2.1.1

commit 13baeb3b70c5f145614cbbd582daa8a6fcbd2b79
Merge: ceee259 123a058
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Jun 9 15:34:53 2015 -0700

    Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302

    Do not set auth headers for registry v1 if 302

commit ceee2595b6b38ec2f7fb01436884b41902acfecc
Merge: 5e86b81 2b4facd
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Jun 9 14:34:52 2015 -0700

    Merge pull request #12583 from Mic92/hack/explicit-bundles

    Hack/explicit bundles

commit 416e855e9b33464c81e86ff47ed19c93a781e604
Author: mapk0y <mapk0y@gmail.com>
Date:   Wed Jun 10 06:26:07 2015 +0900

    fix typo.

    Signed-off-by: mapk0y <mapk0y@gmail.com>

commit 38acd31e8a99ef043f9a5cf84f968ebebc31614e
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Tue Jun 9 13:54:57 2015 -0700

    Update libcontainer to v2.1.1

    It includes fix for mounting / as volume on SELinux.
    docker/libcontainer#619

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit 5e86b818ed41c4dfd90624b43b5e4da29e39d653
Merge: 18ddc27 3044816
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Tue Jun 9 13:30:55 2015 -0700

    Merge pull request #13828 from calavera/plugin_fixes

    Fix volume plugin serialization.

commit 18ddc2728d53d4ed014e615115947006fdfe2a20
Merge: 06aef2b 7b9ae69
Author: David Calavera <david.calavera@gmail.com>
Date:   Tue Jun 9 11:30:06 2015 -0700

    Merge pull request #13805 from aboch/czo

    Add integ test for unpublished ports in ps o/p

commit 06aef2b5c24d694a4876bd43c57868dad59e2e11
Merge: 90259fe 73bc885
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Tue Jun 9 10:42:24 2015 -0700

    Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container

    daemon: cleanup getting container logic

commit 30448166deca62e1f3a43f8e86cd02244b499344
Author: David Calavera <david.calavera@gmail.com>
Date:   Tue Jun 9 10:23:01 2015 -0700

    Fix volume plugin serialization.

    Unmarshal errors into strings.
    Fix `omit` typos.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 7b9ae696d86066f6245e2c17e7afd5ce8e868fe5
Author: Alessandro Boch <aboch@docker.com>
Date:   Fri Jun 5 14:50:11 2015 -0700

    Add integ test for unpublished ports in ps o/p

    - This is a test to assert the fix #13734

    Signed-off-by: Alessandro Boch <aboch@docker.com>

commit 90259fed2ecc0b21a41e997bd4812aa845b79dfb
Merge: 3b01dac cd7e2a6
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Tue Jun 9 18:26:07 2015 +0200

    Merge pull request #12031 from jlhawn/build_cache_ignore_mtime

    Make build cache ignore mtime

commit 3b01dac44d0095c31354c0f58e5ff26bf6ef12f2
Merge: 7f6aa3b f4a3e8b
Author: James Turnbull <james@lovedthanlost.net>
Date:   Tue Jun 9 04:56:35 2015 -0400

    Merge pull request #13814 from duglin/DocTweak

    Fix COPY/ADD quoted/json form

commit 73bc885b23fb06b6d9d6cb554fde93fe0e6bcb98
Author: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date:   Tue Jun 9 13:47:31 2015 +0800

    daemon: cleanup getting container logic

    Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

commit 2b4facdf2ed6b1074a2a8abc031bf0827b6d5f33
Author: Jörg Thalheim <joerg@higgsboson.tk>
Date:   Mon Apr 20 12:21:21 2015 +0200

    hack: explicit bundles for integration-cli prequisites

    no longer load hide critical code such as in .integration-daemon-{start,stop},
    if this step failed, it will had logged the corresponding module before:

    ---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)

    which is nicer to debug.

    This will make it also easier to execute a single tests in an interactive shell.

    $ make shell
    docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
    docker> docker ps
    CONTAINER ID        IMAGE               COMMAND             CREATED STATUS              PORTS               NAMES
    docker> go test github.com/docker/docker/integration-cli

    Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>

commit 7f6aa3b783620065281493a88ac1cc2a1833b93d
Merge: 5e0e71b a31be25
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Mon Jun 8 20:38:30 2015 -0700

    Merge pull request #13816 from xiekeyang/remove

    Registry: remove unwanted return variable name

commit a31be2512136444ce473235a35d6fd47634e3f13
Author: xiekeyang <xiekeyang@huawei.com>
Date:   Tue Jun 9 10:07:48 2015 +0800

    Registry: remove unwanted return variable name

    Signed-off-by: xiekeyang <xiekeyang@huawei.com>

commit 5e0e71bbe0cdb2dd23abee130b6ca7887c02731a
Merge: a2ab067 d0c4c7c
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 17:20:33 2015 -0700

    Merge pull request #13714 from flavio/add-suse-support-to-docker-installer

    Added openSUSE and SUSE Linux Enterprise support to install.sh

commit 123a0582b2f9522bdfb95cceabf8dd21af758300
Author: Tibor Vass <tibor@docker.com>
Date:   Mon Jun 8 19:56:37 2015 -0400

    Do not set auth headers if 302

    This patch ensures no auth headers are set for v1 registries if there
    was a 302 redirect.

    This also ensures v2 does not use authTransport.

    Signed-off-by: Tibor Vass <tibor@docker.com>

commit f4a3e8bef0070af6ad883fd06e504a8b1d4c93ba
Author: Doug Davis <dug@us.ibm.com>
Date:   Mon Jun 8 16:29:12 2015 -0700

    Fix COPY/ADD quoted/json form

    Minor tweak to the quoted/json form and made man page look like the Dockerfile
    docs.  W/o the `,` people may think there should be a space delimited list.

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit a2ab067b3c56f6b296150531c94a05b357fc0d70
Merge: 75f6349 fd935ee
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 15:16:10 2015 -0700

    Merge pull request #13022 from Microsoft/10662-addrsrc

    Windows: Add resources for manifest and icon

commit 75f63499a05ecd6511b468b666973ed9d38037ae
Merge: 4ad05ed a121ac8
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Jun 8 15:15:49 2015 -0700

    Merge pull request #12992 from aidanhs/aphs-easy-debug-build

    Allow passing DOCKER_DEBUG= to `make`

commit 9a9dc5ba96d2661f5dc2037db44d0984d2129946
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Apr 27 07:53:12 2015 -0700

    Windows: Don't build Linux graph drivers

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit 4ad05ed9859614203708eec3d3a1ecf0cc81e17a
Merge: 969cb54 71eadd4
Author: David Calavera <david.calavera@gmail.com>
Date:   Mon Jun 8 15:02:47 2015 -0700

    Merge pull request #13808 from Microsoft/10662-volumefixcompile

    Windows: Fix PR13278 compile break

commit 969cb545ae5022dc38113f741f2ba3f873cfb967
Merge: c69d3b7 8bfc810
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Mon Jun 8 14:43:17 2015 -0700

    Merge pull request #13546 from hqhq/hq_checkconfig_rescount

    Don't check RESOURCE_COUNTERS in new kernel

commit c69d3b749dfa19ed0e899c1f7ac5eff8212a9ccf
Merge: b099eb7 ae68dfe
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Mon Jun 8 14:24:32 2015 -0700

    Merge pull request #13790 from jfrazelle/update-authors-mailmap

    update authors and mailmap

commit cd7e2a6b2b529cb4180926352a3fe9e82040d073
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Mon Jun 8 11:42:00 2015 -0700

    [docs] Update builder docs on last-modified times

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 0e10507a1c5985e6fda0ff48e9313ba7a4de761b
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Thu Apr 2 10:42:40 2015 -0700

    [builder] Make build cache ignore mtime

    Build cache uses pgk/tarsum to get a digest of content which is
    ADD'd or COPY'd during a build. The builder has always used v0 of
    the tarsum algorithm which includes mtimes however since the whole
    file is hashed anyway, the mtime doesn't really provide any extra
    information about whether the file has changed and many version
    control tools like Git strip mtime from files when they are cloned.

    This patch updates the build subsystem to use v1 of Tarsum which
    explicitly ignores mtime when calculating a digest. Now ADD and
    COPY will result in a cache hit if only the mtime and not the file
    contents have changed.

    NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
    function. It is a best-effort approach to determining if two sets of
    filesystem content are different.

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 71eadd4176a968399671e5cb4c8de52c40992b01
Author: John Howard <jhoward@microsoft.com>
Date:   Mon Jun 8 13:45:28 2015 -0700

    Windows: Fix PR13278 compile break

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b099eb796a54276ea6585d9647b274d296a83aed
Merge: 875eafb dbf5e36
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Jun 8 09:36:36 2015 -0700

    Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file

    Fix docs URL in systemd service file.

commit 875eafb00b07411e361993d256adf8f459d1bafa
Merge: c622ca6 bf6492e
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Mon Jun 8 17:08:37 2015 +0200

    Merge pull request #13713 from draghuram/manport

    Fix examples in "docker port" man page.

commit bf6492e689e2cb375fe6b39327dbe0655452640a
Author: Raghuram Devarakonda <draghuram@gmail.com>
Date:   Wed Jun 3 15:50:06 2015 -0400

    Fix examples in "docker port" man page.

    Closes #13667.

    Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>

commit c622ca6d4b6575d6711a2c8340f5119730a1b8f9
Merge: a63c7c7 68bfd9e
Author: James Turnbull <james@lovedthanlost.net>
Date:   Mon Jun 8 08:57:13 2015 -0400

    Merge pull request #13797 from eolamey/13796-tiny-systemd-docs-improvements

    Tiny improvements to systemd docs.

commit 68bfd9e3aea088b644c058be77b5fa24bbdea7f9
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Mon Jun 8 04:28:45 2015 +0000

    Tiny improvements to systemd docs.

    Show how to use `systemctl show` and recommend against modifying
    system unit files in `/usr` and `/lib`.

    Fixes #13796.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit dbf5e36fd6257ed237f76a65ccbae4124a4f0bdf
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Mon Jun 8 10:14:35 2015 +0000

    Fix docs URL in systemd service file.

    Fixes #13799.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit a63c7c7be678880fb5c11f3c9cb7b3029d132b7f
Merge: 5d22afc 67552fb
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Sun Jun 7 23:01:39 2015 -0700

    Merge pull request #13582 from coolljt0725/remove_useless_code

    Cleanup: remove some useless code

commit c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Author: Jana Radhakrishnan <mrjana@docker.com>
Date:   Fri Jun 5 15:02:56 2015 -0700

    libnetwork: Add garbage collection trigger

    When the daemon is going down trigger immediate
    garbage collection of libnetwork resources deleted
    like namespace path since there will be no way to
    remove them when the daemon restarts.

    Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

commit 67552fb22d254ba5e515aa899b1da3173f474a14
Author: Lei Jitang <leijitang@huawei.com>
Date:   Sat Jun 6 14:00:33 2015 +0800

    Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting

    Signed-off-by: Lei Jitang <leijitang@huawei.com>

commit 5d22afc54e21677dc3bf5e0f0283aff9d8892701
Merge: 07b22fc 54ac3d9
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Sun Jun 7 16:57:54 2015 -0400

    Merge pull request #13795 from michael-k/daemonFolder

    [integration-cli] Made doc consistent with code

commit 54ac3d9c76df3bbbb54b85b58a503cc1d6155f01
Author: Michael Käufl <docker@c.michael-kaeufl.de>
Date:   Sun Jun 7 22:32:29 2015 +0200

    Made doc consistent with code

    The name of the folder was shortened in a1ea562

    Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>

commit 07b22fcf50f0156a5a15d5392a7dcb340b493f34
Merge: 3c37a30 4ce8177
Author: Doug Davis <duglin@users.noreply.github.com>
Date:   Sun Jun 7 12:28:41 2015 -0400

    Merge pull request #13787 from runcom/check-nil-Config

    Avoid nil pointer dereference while creating a container with an empty Config

commit 3c37a307bcd67bbb3f1b0333dd30eb45b1650492
Merge: 3d10540 173d091
Author: James Turnbull <james@lovedthanlost.net>
Date:   Sun Jun 7 09:25:15 2015 -0400

    Merge pull request #13791 from eolamey/minor-docs-fixes

    Fix a typo and a minor formatting issue in the docs.

commit 173d0918a8ddffe1ba8a057527feccb6bee7f30b
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Sun Jun 7 07:07:04 2015 +0000

    Fix a typo and a minor formatting issue in the docs.

    Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>

commit ae68dfe31b641a1dad7e3072ed2413dc32cfcd32
Author: Jessica Frazelle <princess@docker.com>
Date:   Sat Jun 6 21:38:49 2015 -0700

    update authors and mailmap

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit 3d10540bc330ec0a99229e2a943ae04a0f8b38c9
Merge: 3c132ff 5fa6014
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Sat Jun 6 16:02:59 2015 -0700

    Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please

    Restore --default-gateway{,-v6} daemon options.

commit 4ce817796e639391f6bc3e338f5a88985daacaca
Author: Antonio Murdaca <runcom@linux.com>
Date:   Sat Jun 6 18:41:42 2015 +0200

    Avoid nil pointer dereference while creating a container with an empty Config

    Signed-off-by: Antonio Murdaca <runcom@linux.com>

commit 3c132ff62d49247abed25a5686611bcac6801b23
Merge: ffd74e7 d32e01b
Author: James Turnbull <james@lovedthanlost.net>
Date:   Sat Jun 6 08:50:27 2015 -0400

    Merge pull request #13764 from bcexelbi/bexelbie_man_typo

    Fixing typo in Dockerfile manpage

commit ffd74e74b19cf402f7d9a98fe77790c4a79655da
Merge: f208639 3fcf53d
Author: moxiegirl <mary@docker.com>
Date:   Fri Jun 5 18:41:37 2015 -0700

    Merge pull request #13776 from duglin/MinorVolDocEdit

    Minor doc edit to add clarity around the --volume path format

commit c0b44218196ab597d22eb6344e8770fdee73067b
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 18:07:41 2015 -0700

    Update graph to use digest type

    Update get and set functions to use digests.
    Update push code to use the digest type instead of string

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit bb50a4159bda8e6f2d47b69ddd476ab32ac6be14
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 15:32:31 2015 -0700

    Update graph walkhistory to pass by value

    Remove unused graph history function

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit 2b58b677a54950bc78c13760ef79fe6284154847
Author: Derek McGowan <derek@mcgstyle.net>
Date:   Fri Jun 5 15:31:10 2015 -0700

    Separate graph from image

    Move graph related functions in image to graph package.
    Consolidating graph functionality is the first step in refactoring graph into an image store model.
    Subsequent refactors will involve breaking up graph into multiple types with a strongly defined interface.

    Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

commit f20863929b3ca7c6a2735200404ec8af8fd6ebbf
Merge: 7c64ed5 ff9877c
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 15:43:55 2015 -0700

    Merge pull request #13778 from LK4D4/rename_file

    Rename test file to have _test postfix

commit 3fcf53db920de9d9111a86bd0eda90a059885754
Author: Doug Davis <dug@us.ibm.com>
Date:   Fri Jun 5 12:42:48 2015 -0700

    Minor doc edit to add clarity around the --volume path format
    Also add a comment to the ValidatePath func so devs/reviewers
    know exactly what its looking for.

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit ff9877ccc4db4d0891583ebac6558a235b028942
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Fri Jun 5 13:49:52 2015 -0700

    Rename test file to have _test postfix

    Without this go test was unable to find line number of error in that
    file.

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit 7c64ed5c8c49d786d626f6a4704d868ae4662374
Merge: af29aff 77bd53a
Author: moxiegirl <mary@docker.com>
Date:   Fri Jun 5 13:36:33 2015 -0700

    Merge pull request #12573 from clnperez/doc-article-baseimage

    Update doc with usage of the scratch image

commit af29aff53c95ed2a478693b566cc93c19362cce8
Merge: 5c051e2 79621c7
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 13:25:34 2015 -0700

    Merge pull request #13772 from icecrime/13770_image_labels_to_containers

    Container don't inherit from image labels

commit 77bd53adfe6877acd1ff8f07cf148f1dbe0b425d
Author: Christy Perez <christy@linux.vnet.ibm.com>
Date:   Mon Apr 20 15:11:46 2015 -0500

    Update doc with usage of the scratch image

    The scratch image used to be a regular image, but as of
    commit 8936789919c5c8004f346f44a3452d1521818b60 it is a
    special case, and cannot be used with 'docker pull.'

    Update this doc to reflect the new behavior and clear up
    confusion surrounding this image.

    Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>

commit 79621c7728ab83292ffd94d005f10ccebfba055b
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 5 10:56:25 2015 -0700

    Container don't inherit from image labels

    Labels are metadata that apply to a particular resource: image,
    container, maybe volumes and networks in the future. We shouldn't have
    containers inherit from its image labels: they are not the same obejcts,
    and labels cannot be interpreted in the way.

    It remains possible to apply metadata to an image using the LABEL
    Dockerfile instruction, to query them using `docker inspect <img>`, or
    to filter images on them using `docker images --filter <key>=<value>`.

    Fixes #13770.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 5c051e2e263955788809819c37a4a3b9142247ed
Merge: 078b8e5 b180de5
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Jun 5 10:46:31 2015 -0700

    Merge pull request #13767 from duglin/TweakInNetOpts

    Remove duplicate call to net.ParseIP

commit 078b8e54e4429f838ff26ddace34854167fe0b42
Merge: efe5c64 0adfb90
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Fri Jun 5 10:27:58 2015 -0700

    Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh

    fix lxc build

commit efe5c647684d8050ed174e0984d07de0f8489bbd
Merge: 69c2f56 bfed4b7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Jun 5 10:16:24 2015 -0700

    Merge pull request #13636 from tiborvass/refactor-tls

    Refactor TLS code with a new `tlsconfig` package

commit 69c2f5649a135835d5ea8e519a4f1b37f9d7127f
Merge: edb7e84 d8680f7
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Fri Jun 5 19:11:51 2015 +0200

    Merge pull request #13748 from icecrime/experimental_docs

    Minor changes to experimental docs

commit 0adfb908a682e679b54f511fe89e668d6e676dda
Author: Jessica Frazelle <princess@docker.com>
Date:   Fri Jun 5 09:14:19 2015 -0700

    fix lxc build

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit b180de55caa382fd6ced4488d68392edd1d34da0
Author: Doug Davis <dug@us.ibm.com>
Date:   Fri Jun 5 09:44:10 2015 -0700

    Remove duplicate call to net.ParseIP
    and a little cleanup

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Author: Tibor Vass <tibor@docker.com>
Date:   Thu May 7 09:49:07 2015 -0700

    Refactor TLS code with a new `tlsconfig` package

    This patch creates a new `tlsconfig` package to handle creation of
    secure-enough TLS configurations for clients and servers.

    The package was created by refactoring TLS code in the client and the
    daemon. After this patch, it is expected that all code creating TLS
    configurations use this `tlsconfig` package for greater security,
    consistency and readability.

    On the server side, this fixes a bug where --tlsverify was not taken
    into account. Now, if specified, it will require the client to
    authenticate.

    Signed-off-by: Tibor Vass <tibor@docker.com>

commit edb7e84ddbe8df4767e7249c76551ce69d68e8f4
Merge: 159f5e0 0c84604
Author: Phil Estes <estesp@gmail.com>
Date:   Fri Jun 5 11:43:47 2015 -0400

    Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs

    Fix goroutine leak on logs -f with no output

commit d32e01be1ae7e72b4d9e4a6aeb462c60a8dc299c
Author: Brian (bex) Exelbierd <bexelbie@redhat.com>
Date:   Fri Jun 5 16:33:11 2015 +0200

    Fixing typo in Dockerfile manpage

    Signed-off-by: Brian Exelbierd <bex@pobox.com>

commit 159f5e01377bd55d3bbc63dea759afb5503542b4
Merge: cd1a1ee 9ed2cb3
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Fri Jun 5 21:07:57 2015 +1000

    Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5

    Bring over DHE docs updates for publishing

commit 9ed2cb300b255842a3d318a112784b806c1bf8e7
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Fri Jun 5 21:06:59 2015 +1000

    Bring over DHE docs updates for publishing

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Author: Eric-Olivier Lamey <eo@lamey.me>
Date:   Fri Jun 5 05:57:59 2015 +0000

    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>

commit ed39fbeb2ad3959f37cf6c16aaf30aacb3292817
Author: Samuel Karp <skarp@amazon.com>
Date:   Wed Jun 3 12:01:53 2015 -0700

    Adjust disallowed CpuShares in /containers/create

    Previous versions of libcontainer allowed CpuShares that were greater
    than the maximum or less than the minimum supported by the kernel, and
    relied on the kernel to do the right thing. Newer libcontainer fails
    after creating the container if the requested CpuShares is different
    from what was actually created by the kernel, which breaks compatibility
    with earlier Docker Remote API versions. This change explicitly adjusts
    the requested CpuShares in API versions < 1.20.

    Signed-off-by: Samuel Karp <skarp@amazon.com>

commit cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Merge: e33aeac 4572329
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Jun 4 16:37:59 2015 -0700

    Merge pull request #13752 from tianon/fix-release-debs

    Fix release script to release _both_ .deb files

commit e33aeac70892b2088442fc146fb16ab59b4eb58c
Merge: a06e0bb 22b195f
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 4 16:09:24 2015 -0700

    Merge pull request #13640 from Microsoft/10662-implementmeminfo

    Windows: Implement ReadMemInfo()

commit 4572329d4b1d7b4f9cb638961a299f79443506bb
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Thu Jun 4 15:51:12 2015 -0700

    Fix release script to release _both_ .deb files

    Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

commit a06e0bb8b49819402180331d325d919f865a5fbd
Merge: a2602c6 78bc233
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Fri Jun 5 00:42:22 2015 +0200

    Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output

    registry: debugTransport should print with testing.T.Log

commit a2602c617d0afcf829983c46abd9cc95f2003078
Merge: b63ec6e 8b4c0de
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 15:39:31 2015 -0700

    Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info

    Cleanup Daemon.verifyVolumesInfo() a bit

commit 0c84604f5458bc38b793e5bcdf86624eef3e3184
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Jun 4 12:15:33 2015 -0700

    Fix goroutine leak on logs -f with no output

    Also noticed potential hang when only stdout or stderr are used with
    follow=1

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 543cf79ffba276fe90ff9eb3a85adb4a53e31366
Author: John Howard <jhoward@microsoft.com>
Date:   Thu Jun 4 10:29:57 2015 -0700

    Add GOOS in User-Agent

    Signed-off-by: John Howard <jhoward@microsoft.com>

commit b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Merge: b264282 ea180a7
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 12:05:47 2015 -0700

    Merge pull request #13734 from aboch/master

    Fix for #13720. Unpublished ports missing in docker ps

commit fd935ee63db31e73b5ee5594644e04b959ead374
Author: John Howard <jhoward@microsoft.com>
Date:   Wed May 6 08:41:17 2015 -0700

    Windows: Build docker.exe manifested and with icon

    Signed-off-by: John Howard <John.Howard@microsoft.com>

commit b26428257f211f21f0f93d27d0ea74531cda9047
Merge: 7c2178b 16a5590
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Thu Jun 4 11:14:34 2015 -0700

    Merge pull request #13728 from calavera/copy_old_volume_content

    Migrate data from old vfs paths to new local volumes path.

commit 7c2178b3582729489f09fdce6aee28d2238ac047
Merge: cbe120d 318defe
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Thu Jun 4 11:10:55 2015 -0700

    Merge pull request #13736 from SvenDowideit/double-the-double-the-lines

    Tiny spelling issue in the debian control file :)

commit cbe120db587cddc8af9885e9ff2f2a69040deb4e
Merge: 9069cde 9ec5e4f
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Thu Jun 4 10:59:37 2015 -0700

    Merge pull request #13745 from icecrime/test_import_path

    Fix kr/pty import path in test-integration-cli

commit d8680f7beb84b036d2122739eda9ea79809a6f25
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 10:33:20 2015 -0700

    Remove reference to experimental release

    Remove reference to experimental releases as it is really a nightly
    channel rather than a scheduled release.

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 8352f2e26451549217fa52fe03f8df556af3d8ca
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 10:32:50 2015 -0700

    Rename EXPERIMENTAL.md to README.md

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 16a5590c5be4be555a1ebe52d031d4e9e0e6da23
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 15:31:20 2015 -0700

    Migrate data from old vfs paths to new local volumes path.

    Signed-off-by: David Calavera <david.calavera@gmail.com>

commit 9069cded5761de31b786d70f269fa47732e3e5ed
Merge: 2c09dbb 112b7e6
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Thu Jun 4 10:05:01 2015 -0700

    Merge pull request #13586 from kvasdopil/zfs-88chars

    Avoid 88-chars mountpoint length limit on freebsd

commit 2c09dbb7ddab685d52a2748e6f78fc8e90ad4469
Merge: 4efedb3 d312247
Author: David Calavera <david.calavera@gmail.com>
Date:   Thu Jun 4 09:21:53 2015 -0700

    Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir

    Don't forget to clenaup tmpdir in TestFileSpecPlugin()

commit 4efedb3fba49623de562b189a145c8334eaba609
Merge: ef3e956 95dfc4c
Author: moxiegirl <mary@docker.com>
Date:   Thu Jun 4 09:11:00 2015 -0700

    Merge pull request #13716 from moxiegirl/move-experimental

    Moving experimental

commit 9ec5e4f7df15f5c1e9862f71fe3079188fff0106
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Thu Jun 4 09:02:14 2015 -0700

    Fix kr/pty import path

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit d31224743b31b3e29ed7df0835193ff1ac4e723c
Author: Zefan Li <lizefan@huawei.com>
Date:   Thu Jun 4 13:21:28 2015 +0800

    Don't forget to clenaup tmpdir in TestFileSpecPlugin()

    Also remove redundant code.

    Signed-off-by: Zefan Li <lizefan@huawei.com>

commit 318defe1de8a9d2930d784306fd024c59e21a8c5
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Thu Jun 4 18:16:24 2015 +1000

    Tiny spelling issue in the debian control file :)

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit ea180a73bc00491915d620c14877318cc33b2a73
Author: Alessandro Boch <aboch@docker.com>
Date:   Wed Jun 3 22:47:08 2015 -0700

    Fix for #13720

    Signed-off-by: Alessandro Boch <aboch@docker.com>

commit ef3e956aa2c8b24fd18c7fa693b366be781fc30a
Merge: 57bba29 aa54a93
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 22:05:09 2015 -0700

    Merge pull request #13704 from tianon/build-utc

    Swap build-* to use UTC instead of local time

commit 57bba29f7910e0fe7d99ecb6375d7c56fd1812bf
Merge: f37e6e1 83208a5
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 21:40:15 2015 -0700

    Merge pull request #13732 from mavenugo/netdisabled

    Using container NetworkDisabled to fix #13725

commit 83208a531d1824ea7b0a55f9419e915e446c780a
Author: Madhu Venugopal <madhu@docker.com>
Date:   Wed Jun 3 17:31:22 2015 -0700

    Using container NetworkDisabled to fix #13725

    container.config.NetworkDisabled is set for both daemon's
    DisableNetwork and --networking=false case. Hence using
    this flag instead to fix #13725.

    There is an existing integration-test to catch this issue,
    but it is working for the wrong reasons.

    Signed-off-by: Madhu Venugopal <madhu@docker.com>

commit f37e6e180f67db73e8db9f3eaebb84a42fc01914
Merge: fdd6175 229b599
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 17:24:53 2015 -0700

    Merge pull request #13731 from jfrazelle/fix-version-on-old-versions

    fix version struct on old versions

commit fdd6175bca8bcd2a189e18964ec3e92645ee73c3
Merge: babf751 6945ac2
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 17:14:58 2015 -0700

    Merge pull request #13718 from runcom/fix-containers-json

    SizeRW & SizeRootFs omitted if empty in /container/json call

commit 229b599259b24b30fdecbb70bdbba417a81e9723
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 3 16:56:09 2015 -0700

    fix version struct on old versions

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit babf751e1b96641ffd643b32394bf57e2de6c609
Merge: ca66419 fa02034
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 14:24:37 2015 -0700

    Merge pull request #13715 from LK4D4/update_logrus

    Update github.com/Sirupsen/logrus to 0.8.2

commit ca66419522a40b86ece75b0eb044d6d394acacec
Merge: ad56d79 7943bce
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Jun 3 14:21:38 2015 -0700

    Merge pull request #13709 from jfrazelle/update-url

    Update urls from .com to .org.

commit 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Author: Antonio Murdaca <runcom@linux.com>
Date:   Wed Jun 3 23:13:56 2015 +0200

    SizeRW & SizeRootFs omitted if empty in /container/json call

    Signed-off-by: Antonio Murdaca <runcom@linux.com>

commit ad56d797d3cbac8d02fe2542f5673bbdd3d862b8
Merge: f18ce10 9e7fc24
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 13:43:39 2015 -0700

    Merge pull request #13712 from LK4D4/fix_leak_events

    Support CloseNotifier for events

commit 95dfc4c4a545c3ca35ad7582bbfe4a627bd6a5fc
Author: Mary Anthony <mary@docker.com>
Date:   Wed Jun 3 13:43:27 2015 -0700

    Moving experimental

    Signed-off-by: Mary Anthony <mary@docker.com>

commit 7943bce8942ee8c262180652951216d963fa6202
Author: Jessica Frazelle <princess@docker.com>
Date:   Wed Jun 3 12:08:40 2015 -0700

    Update urls from .com to .org.

    I added 301 redirects from dockerproject.com to dockerproject.org but may as
    well make sure everything is updated anyways.

    Signed-off-by: Jessica Frazelle <princess@docker.com>

commit fa020341e46cfe127b1e1124aa482651aecde359
Author: Alexander Morozov <lk4d4@docker.com>
Date:   Wed Jun 3 13:21:58 2015 -0700

    Update github.com/Sirupsen/logrus to 0.8.2

    Fix #13708

    Signed-off-by: Alexander Morozov <lk4d4@docker.com>

commit f18ce101fbdf6c62a5643f826ed69a8abb843d87
Merge: a29633f 4e3b21f
Author: Antonio Murdaca <runcom@users.noreply.github.com>
Date:   Wed Jun 3 22:14:42 2015 +0200

    Merge pull request #13165 from ahmetalpbalkan/durations

    Allow duration strings as --since/--until

commit d0c4c7c83f4882dc704a8089029a012e9b1a9a36
Author: Flavio Castelli <fcastelli@suse.com>
Date:   Wed Jun 3 21:50:36 2015 +0200

    Added openSUSE and SUSE Linux Enterprise support to install.sh

    Handle docker installation on openSUSE and SUSE Linux Enterprise
    via https://get.docker.io/

    Signed-off-by: Flavio Castelli <fcastelli@suse.com>

commit a29633f6878369081dcdb9886ca7e24a082d0393
Merge: b301219 725f341
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Wed Jun 3 12:30:12 2015 -0700

    Merge pull request #13703 from runcom/13691-container-ps-regression

    Do not omit empty json field in /containers/json api response

commit b30121984e500ce7555a0aa10cdf17b2a5261cf4
Merge: c962f53 a448b7a
Author: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date:   Wed Jun 3 21:24:13 2015 +0200

    Merge pull request #13702 from BenSeverson/patch-1

    quick doc fix for windows versions

commit c962f53a3e66dcfaf6c335df805d99cb5784245f
Merge: 521926f 4fde1cb
Author: David Calavera <david.calavera@gmail.com>
Date:   Wed Jun 3 12:05:43 2015 -0700

    Merge pull request #13645 from calavera/fix_stats_flaky_test

    Fix stats flaky test.

commit 9e7fc245a79535984c3e0dd3d2c4f042e92cdc6a
Author: Alexander Morozov <lk4d4@docker.com>
Date: …

@grosser grosser referenced this pull request Jun 23, 2015

Merged

faster docker build #481

@jlhawn jlhawn deleted the jlhawn:build_cache_ignore_mtime branch Jul 31, 2015

@srcspider

This comment has been minimized.

srcspider commented Aug 11, 2015

What release is this scheduled for?

[edit] nvm just now noticed the 1.8 milestone at the top

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment