 Paul Nasrat
|
d103214bb0
|
Performance of deleteImageAndChildren.
Don't walk the file system for parents each time we recurse.
Fixes #2852
Upstream-commit: 4e826e99b278ef3cc438553e958727397b4d9ee7
Component: engine
|
2013-11-27 12:55:15 -05:00 |
|
 Guillaume J. Charmes
|
524c1ee04b
|
Merge pull request #68 from crosbymichael/daemon-docs
Add daemon docs with selecting graph driver
Upstream-commit: 3a2fbcfdece8a9cc66a037705e16adab5e866b91
Component: engine
|
2013-11-25 11:06:28 -08:00 |
|
|
Guillaume J. Charmes
|
e80dc59739
|
Merge pull request #71 from crosbymichael/fix-dummy-import
Rename dummy in driver.go to vfs
Upstream-commit: d47d49a2f9bab4f6a68d61e0c1e52ef46f406e84
Component: engine
|
2013-11-25 10:30:20 -08:00 |
|
 Michael Crosby
|
b1b08f39e6
|
Rename dummy in driver.go to vfs
Upstream-commit: 8b0b10b6f9fa152346e62b5dad1f4d430ae0e4d1
Component: engine
|
2013-11-25 10:28:17 -08:00 |
|
|
Guillaume J. Charmes
|
9b82922439
|
Merge pull request #67 from crosbymichael/driver-flag
Change graph-driver flag to be s
Upstream-commit: 399c71de8331d8ff35e33c5b810a647f6ea92f1a
Component: engine
|
2013-11-25 09:45:31 -08:00 |
|
|
Michael Crosby
|
5c5c144532
|
Add daemon docs with selecting graph driver
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
|
2013-11-25 09:44:55 -08:00 |
|
|
Michael Crosby
|
93120354fd
|
Change graph-driver flag to be s
Upstream-commit: b4eeb6be617d96132cbd5998a658e5ab88334940
Component: engine
|
2013-11-25 09:43:32 -08:00 |
|
|
Guillaume J. Charmes
|
d197a9d049
|
Merge pull request #69 from crosbymichael/rename-dummy
Rename dummy driver to vfs
Upstream-commit: 41704d8933990eda71ac511e0c13593264468fb9
Component: engine
|
2013-11-25 09:42:50 -08:00 |
|
|
Michael Crosby
|
1e5b210a39
|
Merge pull request #70 from codeaholics/use-https-url-in-dockerfile
Clone LVM using https: instead of git:
Upstream-commit: 64dd4afed68bed2bab7b811a47035fc987cb7f09
Component: engine
|
2013-11-25 09:17:35 -08:00 |
|
 Danny Yates
|
3705ed705e
|
Clone LVM using https: instead of git:
The ports for the git protocol are not open in all corporate environments
Upstream-commit: ad23745456f9bb9c1c3da3796a2ab769f192bf36
Component: engine
|
2013-11-25 17:12:18 +00:00 |
|
|
Michael Crosby
|
a54274e072
|
Rename dummy driver to vfs
Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482
Component: engine
|
2013-11-25 09:04:04 -08:00 |
|
|
Michael Crosby
|
627f045fff
|
Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
|
2013-11-22 14:06:59 -08:00 |
|
 Victor Vieux
|
a684772eab
|
Merge pull request #56 from shykes/creack-dm-plugin
Use variable to call functions in devmapper_wrapper + some formatting
Upstream-commit: a26f9183bd2c0bed032fc9f7f2359352167ab3ea
Component: engine
|
2013-11-22 14:05:59 -08:00 |
|
|
Victor Vieux
|
c220f2eacd
|
Merge pull request #2822 from dotcloud/better_port_help
Better port help
Upstream-commit: 944a48ec5a0bd1d27c66b56950316e2613641eb5
Component: engine
|
2013-11-22 13:59:35 -08:00 |
|
 Guillaume J. Charmes
|
a1d40e81ca
|
Use variable to call functions in devmapper_wrapper + some formatting
Upstream-commit: 79e2b33ede415736f9124089a61f4512c16ddddd
Component: engine
|
2013-11-22 12:25:37 -08:00 |
|
|
Guillaume J. Charmes
|
6e7d75df95
|
Format CmdRun
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
|
2013-11-22 12:14:34 -08:00 |
|
|
Guillaume J. Charmes
|
4a4a051d8a
|
Use a constant for PortSpecTemplate + display the template in the CmdRun help
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
|
2013-11-22 12:00:34 -08:00 |
|
|
Guillaume J. Charmes
|
c04337f42e
|
Reformatting parseRun and partParse
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
|
2013-11-22 11:58:02 -08:00 |
|
|
Michael Crosby
|
7c2bc2f42b
|
Merge pull request #2769 from vbatts/none_bridge
Do not setup bridge ip if 'none' bridge is provided
Upstream-commit: d4c8fb9ee27222e4d33b616bd63ea7863e0064ee
Component: engine
|
2013-11-22 11:48:33 -08:00 |
|
|
Michael Crosby
|
d8bc0d9deb
|
Merge pull request #2823 from dotcloud/2817-run_rm-fix
Fix docker run -rm
Upstream-commit: ae8c589d35e9cd7148d98a0471d0c5c9c77e3908
Component: engine
|
2013-11-22 11:35:29 -08:00 |
|
|
Guillaume J. Charmes
|
51748282f3
|
Merge pull request #2677 from mrallen1/fix/2627
Check for a terminal before using escapes
Upstream-commit: 6130f2531e624f56d827a1e482af712e1c888342
Component: engine
|
2013-11-22 11:30:16 -08:00 |
|
 Vincent Batts
|
92b39790ed
|
fix the nil pointer panic on closing a disabled network manager
Issue #2768
Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444
Component: engine
|
2013-11-22 14:28:49 -05:00 |
|
 Victor Vieux
|
f1afbc9e5f
|
fix -rm
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
|
2013-11-22 11:23:48 -08:00 |
|
 Mark Allen
|
65390c08ce
|
Pass terminal setting to display utils
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
|
2013-11-22 00:05:55 -06:00 |
|
|
Victor Vieux
|
3f82c6cf46
|
Merge pull request #2812 from dotcloud/bump_v0.6.7
Bump v0.6.7
Upstream-commit: a93e40a158aad6f7364db5db69298e8ad7c38949
Component: engine
|
2013-11-21 18:39:15 -08:00 |
|
|
Victor Vieux
|
89913b0834
|
Bump version to v0.6.7
Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2
Component: engine
|
2013-11-21 18:03:41 -08:00 |
|
|
Victor Vieux
|
5327f28322
|
Merge branch 'master' into bump_v0.6.7
Upstream-commit: 9dc59797e09a20869d99e72f9c849e4e0b2c59bc
Component: engine
|
2013-11-21 17:40:29 -08:00 |
|
|
Michael Crosby
|
cf914fd88c
|
Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
|
2013-11-21 17:18:41 -08:00 |
|
|
Michael Crosby
|
6ea3214afa
|
Merge pull request #62 from shykes/devmapper-unit-tests
Devmapper unit tests
Upstream-commit: 437bdeee5901daa9d73db393767b1c5030c15143
Component: engine
|
2013-11-21 16:54:50 -08:00 |
|
|
Michael Crosby
|
b82d2b8801
|
Merge pull request #2798 from dotcloud/fix_state_race
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
|
2013-11-21 16:39:50 -08:00 |
|
|
Guillaume J. Charmes
|
915356af08
|
Refactor State to be 100% thread safe
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
|
2013-11-21 16:34:58 -08:00 |
|
|
Guillaume J. Charmes
|
26fbc2e027
|
Forbid syscalls in tests, add 2 new unit tests
Upstream-commit: bc82940a575944e4686db203356a8a3fb3a75217
Component: engine
|
2013-11-21 16:32:16 -08:00 |
|
|
Michael Crosby
|
0e00966e8f
|
Merge pull request #2678 from cxmcc/minor
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
|
2013-11-21 16:27:15 -08:00 |
|
|
Michael Crosby
|
8c720af218
|
Merge pull request #2488 from viirya/fix_container_volumes_delete
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
|
2013-11-21 16:20:22 -08:00 |
|
|
Michael Crosby
|
b7afbe130d
|
Merge pull request #2304 from unclejack/fix_layer_size_computation
Fix layer size computation: handle hard links correctly
Upstream-commit: f7c2a00557a304af753e487d87ef5ed9b6266e27
Component: engine
|
2013-11-21 16:10:24 -08:00 |
|
|
Victor Vieux
|
4718170d22
|
Merge pull request #2731 from SvenDowideit/docker-commit-doc
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
|
2013-11-21 15:33:05 -08:00 |
|
 Andy Rothfusz
|
de93f1b190
|
Merge pull request #2772 from bitoiu/patch-3
Change to documentation for AWS AMI request
Upstream-commit: e2dcfc2cf7ea00619e327a900d1b87cb437a634c
Component: engine
|
2013-11-21 15:15:04 -08:00 |
|
|
Andy Rothfusz
|
1eafcb9d5e
|
Merge pull request #2717 from metalivedev/2342-uploadingcontext
Fix #2342. Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
|
2013-11-21 15:09:47 -08:00 |
|
|
Andy Rothfusz
|
96fa8485ac
|
Merge pull request #2799 from rosenhouse/patch-1
Fix title on doc page for remote_api_client_libraries.rst
Upstream-commit: 50239e057309f4efdb6f9ed39d988a8316601103
Component: engine
|
2013-11-21 14:40:33 -08:00 |
|
|
Guillaume J. Charmes
|
e859413830
|
Merge pull request #2763 from dotcloud/use_full_id_delete
Do ont truncate ID on docker rmi
Upstream-commit: 42c23b0f048b417bd233bef3f57e529102ae1177
Component: engine
|
2013-11-21 14:39:38 -08:00 |
|
|
Guillaume J. Charmes
|
5db9d5c4bd
|
Merge pull request #2805 from pmorie/typo
Fix typo in pullImage
Upstream-commit: eec91e794123330271a1679ab74986b6072e3b96
Component: engine
|
2013-11-21 14:35:07 -08:00 |
|
 Paul Morie
|
f8ba7a65e3
|
Fix typo in pullImage
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
|
2013-11-21 17:29:03 -05:00 |
|
|
Guillaume J. Charmes
|
68f143de04
|
Merge pull request #2794 from dotcloud/fix_status_code_and_usage
fix status code and usage
Upstream-commit: bcdeb37bb64eca25bee9b1736a53f8ef4684c9a0
Component: engine
|
2013-11-21 13:48:38 -08:00 |
|
 Gabe Rosenhouse
|
63c337d326
|
Fix title on doc page for remote_api_client_libraries.rst
Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a
Component: engine
|
2013-11-21 12:45:01 -08:00 |
|
|
Guillaume J. Charmes
|
5aa6161466
|
Merge pull request #2797 from crosbymichael/revert-exit-lock
Revert "Lock state before we modify."
Upstream-commit: c4ab4989204e41046f61f660946848d10a759a83
Component: engine
|
2013-11-21 12:19:23 -08:00 |
|
|
Michael Crosby
|
9dfa0ceb9c
|
Revert "Lock state before we modify."
This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.
Upstream-commit: cb70eedfdad40538983f9610322262ce84e284a0
Component: engine
|
2013-11-21 12:11:25 -08:00 |
|
|
Victor Vieux
|
06096928cc
|
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
Upstream-commit: 75a7f4d90cde0295bcfb7213004abce8d4779b75
Component: engine
|
2013-11-21 11:43:07 -08:00 |
|
|
Victor Vieux
|
9331f255c0
|
Merge pull request #63 from tianon/flag-help-consistency
Update a few flag help strings for consistency and clarity
Upstream-commit: da824b4a5a1acd3409ff46f1795180f3303e99a8
Component: engine
|
2013-11-21 11:31:34 -08:00 |
|
 Tianon Gravi
|
cdba895115
|
Update a few flag help strings for consistency and clarity
Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c
Component: engine
|
2013-11-21 12:30:17 -07:00 |
|
|
Victor Vieux
|
ef47b4e273
|
Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
Lock state before we modify.
Upstream-commit: eaeb969138205349c08e485c0bc4d29dbe2567d7
Component: engine
|
2013-11-21 11:28:02 -08:00 |
|