Michael Crosby
9ac293e1a8
Merge pull request #6335 from levigross/master
...
Fixed up if statement
2014-06-11 11:51:57 -07:00
Michael Crosby
6c953a3059
Merge pull request #6357 from crosbymichael/vendor-libcontainer
...
Vendor libcontainer
2014-06-11 10:57:39 -07:00
unclejack
8f909221f5
Merge pull request #6277 from philips/remove-unneeded-time-duration
...
registry: remove unneeded time.Duration()
2014-06-11 20:33:22 +03:00
James Turnbull
96c03d6d92
Merge pull request #6351 from lenw/patch-1
...
minor spelling fix
2014-06-11 06:55:33 -07:00
James Turnbull
a092f979d4
Merge pull request #6349 from chrismckinnel/master
...
Fix some bullet points so they render correctly.
2014-06-11 06:54:44 -07:00
Alexandr Morozov
a1b7a35c90
Fix race in LogEvent
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
fa7c8d523e
Fix race in get/set HostConfig
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
0b3fe55442
Fix race in contStore.List
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Len Weincier
db00e224c2
minor spelling fix
2014-06-11 13:16:53 +02:00
Alexandr Morozov
b1bae92534
Don't exit on eof in header reading in stdcopy
...
There was random lines drops in docker logs because of this
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:13:31 +04:00
chrismckinnel
a247af9c97
Fix some bullet points so they render correctly.
2014-06-11 11:44:30 +01:00
Michael Crosby
d1757c005f
Use libcontainer version tag for vendor script
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-10 20:23:05 -07:00
Michael Crosby
8194556337
Update libcontainer imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-10 19:58:15 -07:00
Michael Crosby
8a8b6d7964
Remove and vendor libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-10 19:49:57 -07:00
James Turnbull
4cf40c968f
Merge pull request #6339 from ostezer/docs-fix-css-title-conflict
...
docs: Fix docs' styling conflict with common names
2014-06-10 13:40:22 -07:00
O.S. Tezer
cb40e3302e
docs: Fix docs' styling conflict with common names
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Closes issue #6329
2014-06-10 11:18:20 -07:00
James Turnbull
9a7bd6d95b
Merge pull request #6322 from crucerucalin/master
...
Repaired broken links in docs/sources/faq.md
2014-06-10 08:46:42 -07:00
Sven Dowideit
9254a62cd6
Merge pull request #6315 from erikh/ubuntu-latest-install-docs
...
Improve documentation on Ubuntu for getting the latest release of docker.
2014-06-11 00:54:52 +10:00
Sven Dowideit
b83a171f9e
Merge pull request #6300 from whatthejeff/patch-1
...
Avoid history expansion.
2014-06-11 00:49:29 +10:00
Tianon Gravi
5ff3a28cb4
Merge pull request #6252 from tianon/update-check-config
...
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
2014-06-10 08:09:34 -06:00
Levi Gross
a7b60b21de
Fixed up if statement
...
Signed-off-by: Levi Gross <levi@levigross.com>
Docker-DCO-1.1-Signed-off-by: Levi Gross <levi@levigross.com> (github: levigross)
2014-06-10 10:02:00 -04:00
Cruceru Calin-Cristian
53802d54d6
Repaired broken links
...
Docker-DCO-1.1-Signed-off-by: Calin Cruceru <crucerucalincristian@gmail.com> (github: crucerucalin)
2014-06-10 08:21:12 +03:00
Erik Hollensbe
7ab1a90e59
Improve documentation on Ubuntu for getting the latest release of
...
docker.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-09 18:31:46 -07:00
unclejack
fb2ac5bedb
Merge pull request #6317 from crosbymichael/libcontainerdep
...
Move libcontainer deps into libcontainer
2014-06-10 03:16:15 +03:00
Michael Crosby
bae6a5a616
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-09 16:01:57 -07:00
Michael Crosby
6158ccad97
Move libcontainer deps into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-09 15:52:12 -07:00
Jeff Welch
052ad32a7b
Avoid history expansion.
...
Docker-DCO-1.1-Signed-off-by: Jeff Welch <whatthejeff@gmail.com> (github: whatthejeff)
2014-06-09 17:30:34 -04:00
Alex Warhawk
cacb5c0dde
restore logo for README.md
...
Docker-DCO-1.1-Signed-off-by: Alex Hirsch <ax.warhawk@gmail.com> (github: W4RH4WK)
2014-06-09 22:15:13 +02:00
Michael Crosby
fd32fc8062
Merge pull request #6305 from crosbymichael/merge_release_v1.0.0
...
Merge release v1.0.0
2014-06-09 07:17:43 -07:00
Michael Crosby
faf5ef6f80
Change version to v1.0.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-09 07:14:51 -07:00
Michael Crosby
07e9ac9ffe
Merge branch 'release' into merge_release_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-09 07:14:40 -07:00
Michael Crosby
d9939758e6
Merge pull request #6303 from crosbymichael/bump_v1.0.0
...
Bump version to v1.0.0
2014-06-09 07:12:42 -07:00
James Turnbull
5dc6339e33
Merge pull request #6302 from Costent/patch-1
...
Update windows.md
2014-06-09 06:14:16 -07:00
William Riancho
875d0b776d
Update windows.md
...
Replace "OS X" by "Windows"
2014-06-09 11:23:54 +02:00
Sven Dowideit
e2fce7d612
Merge pull request #6299 from jamtur01/12link
...
Fixed API 1.12 links and misc other fixes
2014-06-08 18:06:27 -07:00
James Turnbull
135ced208c
Merge pull request #6297 from jamtur01/hub
...
Updated Docker Hub documentation
2014-06-08 18:03:28 -07:00
James Turnbull
871299de0d
Updated Docker Hub documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-08 18:01:44 -07:00
James Turnbull
11fee48c2d
Fixed API 1.12 links and misc other fixes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-08 17:59:22 -07:00
James Turnbull
3b0ae3ec68
Merge pull request #6298 from fredlf/copyedits
...
Edits to Win and OSX install
2014-06-08 17:56:34 -07:00
Fred Lifton
9e2e8188ae
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:36:49 -07:00
Fred Lifton
9bc75d008e
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:35:49 -07:00
Sven Dowideit
a43cebf088
Merge pull request #6295 from ostezer/docs-ref-index-hub
...
Docs: Rename index with hub for ref. section
2014-06-08 16:47:48 -07:00
Sven Dowideit
83b446492c
Merge pull request #6265 from fredlf/copyedits
...
Copyedits
2014-06-08 16:47:12 -07:00
Fred Lifton
4fd9cc9980
Copy edits to Understanding Docker
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 16:46:31 -07:00
Michael Crosby
63fe64c471
Bump to version v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-08 16:42:30 -07:00
Michael Crosby
9722c66dad
Merge branch 'master' into bump_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-08 16:40:19 -07:00
O.S. Tezer
b0a46d1cb9
Docs: Rename index with hub for ref. section
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-08 16:34:47 -07:00
unclejack
e570987c4f
Merge pull request #6293 from vieux/fix_version_decode
...
Fix version numbering
2014-06-09 02:23:27 +03:00
Sven Dowideit
c740c76017
Merge pull request #6294 from SvenDowideit/simplify-windows-networking-docs
...
Simplify the windows docs and fix formatting
2014-06-08 16:14:54 -07:00
SvenDowideit
744d39a466
Simplify the windows docs and fix formatting
...
The mention of NAT is confusing for those coming from pre-host-only networking b2d
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-09 09:10:41 +10:00