3985dc299a
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
2015-04-03 18:58:52 +00:00
3683498d6f
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
2015-04-03 18:52:26 +00:00
55da2e5987
Merge pull request #12059 from whoshuu/readme
...
Clean up formatting in the README
2015-04-03 18:49:26 +00:00
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
b3e9c274dd
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
2015-04-03 18:25:12 +00:00
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
12e7787540
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
2015-04-03 09:55:08 -07:00
bfddad18ce
Clean up formatting in the README
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
2015-04-03 09:50:35 -07:00
61933395eb
Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
...
Add tool to conver disk image into Docker image
2015-04-03 09:32:11 -07:00
c8ca904f15
Merge pull request #11881 from jrjang/master
...
mkimage-arch: set default C.UTF-8 locale
2015-04-03 09:28:11 -07:00
03525d5fc6
Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
...
add MEMCG_SWAP_ENABLED to check-config.sh
2015-04-03 08:50:54 -07:00
2c5da7d1ac
Merge pull request #12018 from sunyuan3/search
...
If docker search with --starts=${negative number}, it would show the war...
2015-04-03 11:38:38 -04:00
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-03 08:31:30 -07:00
05753288c4
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
2015-04-03 06:43:38 -07:00
da61228501
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
2015-04-03 06:41:49 -07:00
57b09068ef
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me >
2015-04-03 14:07:51 +03:00
a3a45a6ec0
Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
...
Add some missing option to bash completion
2015-04-02 22:49:58 -07:00
4e90b47cc2
Merge pull request #12043 from joeygibson/12041-fix-vet-warnings
...
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
2015-04-02 22:07:55 -07:00
a9443de7c5
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
2015-04-03 00:18:21 -04:00
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-03 08:55:34 +08:00
f92e88b7e0
Merge pull request #11995 from icecrime/test_daemon_stop
...
Properly stop test daemon in integration-cli
2015-04-02 20:27:20 -04:00
3f1590f679
Merge pull request #12040 from duglin/TableFromDiff
...
Remove use of Table from 'docker diff'
2015-04-02 17:21:40 -07:00
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-02 16:55:58 -07:00
9c505c906d
Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
...
Fixes docker events since beginning of unix time
2015-04-02 15:03:04 -07:00
962ded2dee
Merge pull request #12036 from crosbymichael/update-libcontainer-apr2
...
Update libcontainaer to d00b8369852285d6a830a8d3b9
2015-04-02 14:46:44 -07:00
3e51a81475
integration-cli: add check for TestPsListContainersSize when no containers are returned
...
* when no containers are returned, go test would then aborts with:
panic: runtime error: index out of range
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
2015-04-02 14:45:52 -07:00
d12fef1515
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-04-02 14:12:55 -07:00
c88b2c422f
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
2015-04-02 16:01:09 -04:00
42c7855014
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
2015-04-02 16:00:39 -04:00
104b20a133
Merge pull request #12026 from cpuguy83/add_self_to_maintainers
...
Add cpuguy83 to maintainers.people
2015-04-02 09:20:19 -07:00
02c2308e39
Properly stop test daemon in integration-cli
...
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-02 08:53:31 -07:00
ccfbe880c8
Merge pull request #12029 from unclejack/testpsgroupportrange_fast
...
integration-cli: make TestPsGroupPortRange fast
2015-04-02 08:48:08 -07:00
cfa8aaf16f
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-02 18:26:29 +03:00
6ac845edad
Add cpuguy83 to maintainers.people
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-02 08:51:47 -04:00
9707286a5c
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
2015-04-02 08:25:49 -04:00
3bea892d54
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-02 09:53:40 +03:00
b6d55ebcbc
Updating with man pages for distribution
...
Went through the man pages to update for the
v2 instance. Checked against the commands.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-01 21:02:19 -07:00
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
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
a9588158b5
Add MEMCG_SWAP_ENABLED to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-02 08:38:39 +08:00
7433c9c92a
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-01 17:31:15 -07:00
34f44c642f
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-01 17:31:09 -07:00
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
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
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
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
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
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
2c0ee48224
Merge pull request #12006 from icecrime/add_kitematic_to_readme
...
Add Kitematic to README.md
2015-04-01 14:41:41 -07:00
7bd250c74d
Add Kitematic to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-01 14:38:49 -07:00
Jessie Frazelle