| commit | 380129d0d7e9b2dbec27aef7186ce5eddd3a3076 | [log] [tgz] |
|---|---|---|
| author | Victor Vieux <vieux@docker.com> | Wed Aug 20 20:19:03 2014 +0000 |
| committer | Victor Vieux <vieux@docker.com> | Wed Aug 20 20:19:03 2014 +0000 |
| tree | a85556f5eb217eefd2c530083d599d2cf8df2b69 | |
| parent | 1df87acb3375b6c2765e2202f178dee699647448 [diff] | |
| parent | b1d20c483ae91870d2525fa2a302d4461cbe8129 [diff] |
Merge remote-tracking branch 'origin/master' into bump_v1.2.0 Conflicts: VERSION daemon/container.go daemon/daemon.go Signed-off-by: Victor Vieux <vieux@docker.com>
diff --git a/VERSION b/VERSION index 13c0078..fe00fb1 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -1.1.2-dev +1.1.2-dev \ No newline at end of file