Michael Crosby
d12fef1515
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-02 14:12:55 -07:00
Tibor Vass
c88b2c422f
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
2015-04-02 16:01:09 -04:00
Tibor Vass
42c7855014
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
2015-04-02 16:00:39 -04:00
Alexander Morozov
104b20a133
Merge pull request #12026 from cpuguy83/add_self_to_maintainers
...
Add cpuguy83 to maintainers.people
2015-04-02 09:20:19 -07:00
Alexander Morozov
ccfbe880c8
Merge pull request #12029 from unclejack/testpsgroupportrange_fast
...
integration-cli: make TestPsGroupPortRange fast
2015-04-02 08:48:08 -07:00
unclejack
cfa8aaf16f
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-02 18:26:29 +03:00
Brian Goff
6ac845edad
Add cpuguy83 to maintainers.people
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-02 08:51:47 -04:00
Tibor Vass
9707286a5c
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
2015-04-02 08:25:49 -04:00
Jessica Frazelle
c447fd339a
TestVolumesFromHasPriority fix race
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-04-01 18:06:28 -07:00
Jessica Frazelle
f472c7236f
fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container...
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
2015-04-01 17:47:36 -07:00
Andrea Luzzardi
b9be50b578
Merge pull request #10745 from jfrazelle/device-dir
...
Mounting a dir of devices like /dev/snd should mount all child devices
2015-04-01 16:53:01 -07:00
Arnaud Porterie
3f77f627d0
Merge pull request #12007 from crosbymichael/fix-oom-hang
...
Return closed channel if oom notification fails
2015-04-01 15:59:20 -07:00
Jessica Frazelle
664004ed0c
Mounting a directory of devices like /dev/snd should mount all child devices.
...
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-04-01 15:57:41 -07:00
Arnaud Porterie
3fe7a3d537
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
2015-04-01 15:34:28 -07:00
Vincent Batts
88b8fc10e3
Merge pull request #11099 from iavael/bugfix/tar-symlinks
...
Fixed handling hardlinks to symlinks in tar stream
2015-04-01 18:34:00 -04:00
Michael Crosby
7061a993c5
Return closed channel if oom notification fails
...
When working with Go channels you must not set it to nil or else the
channel will block forever. It will not panic reading from a nil chan
but it blocks. The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-01 15:30:48 -07:00
Alexander Morozov
2c0ee48224
Merge pull request #12006 from icecrime/add_kitematic_to_readme
...
Add Kitematic to README.md
2015-04-01 14:41:41 -07:00
Arnaud Porterie
7bd250c74d
Add Kitematic to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-01 14:38:49 -07:00
Alexander Morozov
81f9b72c64
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-01 13:40:56 -07:00
Tibor Vass
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
Alexander Morozov
7101419c1c
Merge pull request #11990 from duglin/11985-RemoveDeadCode
...
Remove dead code looking for non-existent err msg
2015-04-01 10:46:10 -07:00
Alexander Morozov
624de8a9cd
Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest
...
Fix random error in cli events test
2015-04-01 09:26:48 -07:00
Doug Davis
39908fc6d9
Add support for more advanced ${xxx:...} syntax
...
Just ${xxx:+...} and ${xxx:-...} for now
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-01 08:11:15 -07:00
moxiegirl
39711c8b26
Merge pull request #11969 from powo/patch-1
...
Update networking.md (IPv6 wrong prefix)
2015-04-01 07:45:31 -07:00
Doug Davis
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-01 07:37:10 -07:00
moxiegirl
dc564d8cf8
Merge pull request #11972 from thaJeztah/docs-fix-heading-level
...
docs: fix heading level of logging drivers
2015-04-01 07:34:45 -07:00
moxiegirl
f73109b883
Merge pull request #11982 from sunyuan3/docker-run
...
Fix typoes in docker-run.1.md
2015-04-01 07:32:06 -07:00
James Turnbull
a73b7354a6
Merge pull request #11954 from ankushagarwal/#11953
...
Use different host and container port for clarity
2015-04-01 09:21:15 -04:00
Yuan Sun
a44451d40e
Fix typoes in docker-run.1.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-01 17:09:01 +08:00
Mabin
e15c3e36cc
Fix random bug in cli events test
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-04-01 11:00:01 +08:00
Michael Crosby
98cfa2aecd
Merge pull request #11975 from duglin/FixOOMTest
...
Increase timeout on TestRunOOMExitCode test
2015-03-31 17:24:26 -07:00
Doug Davis
8d1455d88b
Increase timeout on TestRunOOMExitCode test
...
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-31 16:57:43 -07:00
Michael Crosby
e736f16bbd
Merge pull request #11930 from unclejack/broadcastwriter_refactor
...
pkg/broadcastwriter: use []byte to lower alloc
2015-03-31 16:47:23 -07:00
Michael Crosby
03d3d79b2b
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 16:38:04 -07:00
Jessie Frazelle
596ddef7d7
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
2015-03-31 16:37:32 -07:00
Sebastiaan van Stijn
f855d5dde7
Fix heading level of logging drivers
...
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.
Also changed "Log driver" to "logging driver" for JSON.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-04-01 01:07:22 +02:00
Wolfgang Powisch
6a47c70d60
Update networking.md
...
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
2015-04-01 00:44:41 +02:00
unclejack
153f98bad5
pkg/broadcastwriter: reset after 4 KB w/o stream
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-01 01:26:19 +03:00
Alexander Morozov
c717475714
Fix panic in integration tests
...
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-31 15:12:15 -07:00
Alexander Morozov
d15d1674c3
Skip heavy operations if there is no jsonlog writers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-01 01:02:18 +03:00
unclejack
5550a46946
pkg/broadcastwriter: use []byte to lower alloc
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-01 01:02:18 +03:00
unclejack
b535ed3595
pkg/jsonlog: add JSONLogBytes for low allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-01 01:02:18 +03:00
unclejack
f26f405b00
pkg/broadcastwriter: add test w/ "" stream only
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-01 01:02:18 +03:00
Michael Crosby
7dd79dcc7b
Merge pull request #11952 from ankushagarwal/#11581
...
Add some documentation to pkg/system
2015-03-31 14:58:32 -07:00
Michael Crosby
ded5c73deb
Merge pull request #11962 from vbatts/vbatts-promote_overlay
...
graphdriver: promote overlay above vfs
2015-03-31 14:39:08 -07:00
Alexander Morozov
e4545ed8cb
Merge pull request #11963 from crosbymichael/api-server
...
API Server Socket Refactoring
2015-03-31 14:25:32 -07:00
Vincent Batts
2c72ff1dbf
graphdriver: promote overlay above vfs
...
It's about time to let folks not hit 'vfs', when 'overlay' is supported
on their kernel. Especially now that v3.18.y is a long-term kernel.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-03-31 17:18:49 -04:00
Michael Crosby
da6248751b
Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849
...
Fix progress reader output on close
2015-03-31 14:04:33 -07:00
Jessie Frazelle
749a117267
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
2015-03-31 13:56:23 -07:00
Arnaud Porterie
e04acf8a38
Merge pull request #11045 from brahmaroutu/fixtest_10964
...
Skip TestEventsImagePull unless network is available
2015-03-31 13:48:54 -07:00