LK4D4
eb97163348
Increase time before exit in TestMultipleAttachRestart
...
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-13 21:40:30 +04:00
James Turnbull
7b366b1f01
Merge pull request #6411 from alazaro/patch-1
...
Fix typo
2014-06-13 08:15:29 -07:00
Álvaro Lázaro
52e88d92f0
Fix typo
2014-06-13 15:53:42 +02:00
Michael Crosby
51b188c510
Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
...
Fix some more race conditions
2014-06-12 15:17:10 -07:00
Tibor Vass
8091157038
Merge pull request #6391 from vieux/fix_hostname_file_net_host
...
fix hostname generation with --net=host
2014-06-12 14:11:26 -07:00
Michael Crosby
d871725cf2
Merge pull request #6381 from glyn/prod-ready
...
Remove "production ready" from the roadmap
2014-06-12 14:02:51 -07:00
Victor Vieux
f9f6379a53
Merge pull request #6360 from vieux/remove_beam
...
remove unused beam, will be back later as libchan
2014-06-12 13:55:53 -07:00
Victor Vieux
15243cdbde
Merge pull request #6365 from vieux/allow_net_none_h
...
Allow --net=none and -h
2014-06-12 12:26:54 -07:00
Victor Vieux
f5979b9d0d
add hostname generation with --net=host
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-12 19:20:57 +00:00
Victor Vieux
9494643bf1
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-12 19:11:51 +00:00
Michael Crosby
a8d6d28be4
Merge pull request #6307 from W4RH4WK/master
...
restore logo for README.md
2014-06-12 10:21:10 -07:00
Glyn Normington
784a008346
Remove "production ready" from the roadmap
...
It's done as of v1.0.0.
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
2014-06-12 14:21:20 +01:00
O.S. Tezer
dbee7dd69e
Merge pull request #6372 from ostezer/docs-fix-logged-in-hdr
...
Docs: Fixed logged-in header username label target
2014-06-12 01:17:38 -07:00
Tianon Gravi
3b9e8679db
Merge pull request #6361 from asbjornenge/tmlang_copy
...
Add contribute/syntax highlight for the COPY instruction
2014-06-12 00:06:51 -07:00
Asbjørn Enge
cb47ddd968
Added highlight for the COPY instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-06-12 08:25:09 +02:00
O.S. Tezer
4ccd91f0d8
Docs: Fixed logged-in header username label target
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-11 18:09:43 -07:00
Michael Crosby
c99ee556d4
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
2014-06-11 14:37:01 -07:00
Victor Vieux
6cb16f1c31
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 21:15:48 +00:00
Victor Vieux
f411f8bfc5
Allow --net=none & -h
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 21:07:50 +00:00
Victor Vieux
384b60b940
remove unused beam, will be back later as libchan
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 19:09:55 +00:00
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
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