d54d64d3e2
Merge pull request #12003 from sleinen/patch-1
...
Make explanation consistent with command
Upstream-commit: a6c04f33e141527b24dc373a68ed62e2201803a0
Component: engine
2015-04-03 12:19:37 -07:00
f8af71c0cf
Merge pull request #12057 from icecrime/11925_carry
...
Specify running `boot2docker ip` on host
Upstream-commit: 6d5a0ac11ea50cd46d6f04435e49bb1b08bd0d60
Component: engine
2015-04-03 12:11:53 -07:00
e471adcfbf
Merge pull request #12048 from tianon/auto-btrfs_noversion
...
Change the btrfs_noversion check to be automatic
Upstream-commit: 409ed98c3f95f90311127773baa78904ac8350b6
Component: engine
2015-04-03 19:00:57 +00:00
bf961698dc
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
Upstream-commit: 3985dc299a5958481a9c0dcbd3bc7da69de6a19b
Component: engine
2015-04-03 18:58:52 +00:00
bd5aac3934
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
Upstream-commit: 3683498d6fe233f9f68fb5a6186158293b450049
Component: engine
2015-04-03 18:52:26 +00:00
ef9deeddf0
Merge pull request #12059 from whoshuu/readme
...
Clean up formatting in the README
Upstream-commit: 55da2e59870b62eb2ee1830f0f67e0711494bb03
Component: engine
2015-04-03 18:49:26 +00:00
dd7175bcb6
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
2015-04-03 11:27:06 -07:00
513240409b
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
Upstream-commit: b3e9c274ddadde302d927a866c8704be77c871e0
Component: engine
2015-04-03 18:25:12 +00:00
c121c9b8d9
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
2015-04-03 10:57:52 -07:00
007282bfc1
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
Upstream-commit: 12e77875407f4a4368f198d28d1fadc2c676401c
Component: engine
2015-04-03 09:55:08 -07:00
d13d80f01b
Clean up formatting in the README
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: bfddad18ce126e1a500ffb968f4ff4a9f2683824
Component: engine
2015-04-03 09:50:35 -07:00
b13c0e5f0a
Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
...
Add tool to conver disk image into Docker image
Upstream-commit: 61933395ebdf0c8c54012b6b75312da595183c54
Component: engine
2015-04-03 09:32:11 -07:00
57ace4f0d5
Merge pull request #11881 from jrjang/master
...
mkimage-arch: set default C.UTF-8 locale
Upstream-commit: c8ca904f15b1649ec536c6b9660b4a2247a8c4ce
Component: engine
2015-04-03 09:28:11 -07:00
8827ee42d2
Specify running boot2docker ip on host
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bcbdf77ddb7dab0bf6346400eeb6a0aaaf3d7142
Component: engine
2015-04-03 08:53:44 -07:00
579d436a86
Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
...
add MEMCG_SWAP_ENABLED to check-config.sh
Upstream-commit: 03525d5fc647f4686728f3c6f3acf514433e07cb
Component: engine
2015-04-03 08:50:54 -07:00
6eb83f4ef3
Merge pull request #12018 from sunyuan3/search
...
If docker search with --starts=${negative number}, it would show the war...
Upstream-commit: 2c5da7d1accdc9a2be321602285946bbe29593c2
Component: engine
2015-04-03 11:38:38 -04:00
3a500e0f89
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0b2fa9c707ab06836cf5dd7b3ca9efac64bba925
Component: engine
2015-04-03 08:31:30 -07:00
74b9d04473
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
Upstream-commit: 05753288c462b603d7979d2febf66bca7aa6741a
Component: engine
2015-04-03 06:43:38 -07:00
77e454c28a
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
Upstream-commit: da61228501acf24e651e167efb7b3c25c6bf5548
Component: engine
2015-04-03 06:41:49 -07:00
e2ab7dec3a
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me >
Upstream-commit: 57b09068efe3a278145683ff05b5e352ee00bba3
Component: engine
2015-04-03 14:07:51 +03:00
3274cd15bf
Change the btrfs_noversion check to be automatic
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 3761955e8c1e7534026c469186c3f66c18e77cbc
Component: engine
2015-04-03 01:30:12 -06:00
d2894c5f4b
Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
...
Add some missing option to bash completion
Upstream-commit: a3a45a6ec0278ac37eee7cebe57e728b2cd2165c
Component: engine
2015-04-02 22:49:58 -07:00
3b7f375359
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
Upstream-commit: a9443de7c5759398804acaa3fd9ccfb196557cfe
Component: engine
2015-04-03 00:18:21 -04:00
8c6dabaae6
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
2015-04-03 08:55:34 +08:00
7156a27c06
Merge pull request #11995 from icecrime/test_daemon_stop
...
Properly stop test daemon in integration-cli
Upstream-commit: f92e88b7e0bb782badbd45d95a4013c7f1ddbb19
Component: engine
2015-04-02 20:27:20 -04:00
e0fc0cdcdd
Merge pull request #12040 from duglin/TableFromDiff
...
Remove use of Table from 'docker diff'
Upstream-commit: 3f1590f6797a30dfd30010d6d2e1567ff6d53729
Component: engine
2015-04-02 17:21:40 -07:00
68cf0c513e
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
2015-04-02 16:55:58 -07:00
efa6b62065
Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
...
Fixes docker events since beginning of unix time
Upstream-commit: 9c505c906d318df7b5e8652c37e4df06b4f30d56
Component: engine
2015-04-02 15:03:04 -07:00
c1f9e7351f
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 >
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
2015-04-02 14:45:52 -07:00
54f3509eb1
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
7a161db875
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
2015-04-02 16:01:09 -04:00
5a322b178c
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
Upstream-commit: 42c78550142321f4b5109118f3d2d2b8c529e83c
Component: engine
2015-04-02 16:00:39 -04:00
f437be36ca
Merge pull request #12026 from cpuguy83/add_self_to_maintainers
...
Add cpuguy83 to maintainers.people
Upstream-commit: 104b20a133e03b66dfd663ee135b0ac1e3bc7c73
Component: engine
2015-04-02 09:20:19 -07:00
c2b08878f0
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 >
Upstream-commit: 02c2308e39930677a7f4bb7f4215331a4d87566f
Component: engine
2015-04-02 08:53:31 -07:00
1031605b86
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
2015-04-02 18:26:29 +03:00
b507a74819
Add cpuguy83 to maintainers.people
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6ac845edadbf6374a9ee53f105c34265aed32d42
Component: engine
2015-04-02 08:51:47 -04:00
088a52cbda
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
842af15e9f
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3bea892d5458fc627f2ebe26f44a09df018d1fcc
Component: engine
2015-04-02 09:53:40 +03:00
2fbe877abc
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 >
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
3c9c482afa
TestVolumesFromHasPriority fix race
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Upstream-commit: c447fd339a9293ea528ba0c8f4154cf1f953186c
Component: engine
2015-04-01 18:06:28 -07:00
51cc2549fc
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)
Upstream-commit: f472c7236f7f7ea069b2997391569e5ec60981ab
Component: engine
2015-04-01 17:47:36 -07:00
c94431c226
Add MEMCG_SWAP_ENABLED to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: a9588158b54bc8866bddfa0445c14831e02ebbbc
Component: engine
2015-04-02 08:38:39 +08:00
82a7741d14
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 7433c9c92a9d2b53331f729249ddbbfa70cb76de
Component: engine
2015-04-01 17:31:15 -07:00
acae61c8ad
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e
Component: engine
2015-04-01 17:31:09 -07:00
9135f9f621
Merge pull request #10745 from jfrazelle/device-dir
...
Mounting a dir of devices like /dev/snd should mount all child devices
Upstream-commit: b9be50b578f86e858113b9c334e1748e15b63263
Component: engine
2015-04-01 16:53:01 -07:00
d12a5b6e48
Merge pull request #12007 from crosbymichael/fix-oom-hang
...
Return closed channel if oom notification fails
Upstream-commit: 3f77f627d041ae388f4f591a2187be225629d6b7
Component: engine
2015-04-01 15:59:20 -07:00
c8180f954e
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)
Upstream-commit: 664004ed0c6c99369720a00f5673f1e106d9496d
Component: engine
2015-04-01 15:57:41 -07:00
8f29ea870c
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
Upstream-commit: 3fe7a3d53766de88cddd0e1c324869183cd609cf
Component: engine
2015-04-01 15:34:28 -07:00
8391dba9e0
Merge pull request #11099 from iavael/bugfix/tar-symlinks
...
Fixed handling hardlinks to symlinks in tar stream
Upstream-commit: 88b8fc10e3dc5613859da31900e0a1b0bbb303c6
Component: engine
2015-04-01 18:34:00 -04:00
aeb6266db3
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 >
Upstream-commit: 7061a993c5b620d6e68450f1b90f3458bfa1add0
Component: engine
2015-04-01 15:30:48 -07:00
