f8a327d015Merge pull request #72 from shykes/creack-reduce-debug
Michael Crosby
2013-11-25 15:50:07 -08:00
c1bd7eb1b4Merge pull request #2725 from SvenDowideit/docker-export-doc
Andy Rothfusz
2013-11-25 14:42:57 -08:00
d05e72dea8Merge pull request #2853 from estenberg/cfe-docker-process
Andy Rothfusz
2013-11-25 14:31:52 -08:00
f9b4bbea9edocker in-container process management with CFEngine Upstream-commit: 937f52aef98ac61bca75ef25c16b79b5fafa58ff Component: engine
Eystein Måløy Stenberg
2013-11-22 16:06:15 -08:00
2f62549ee3Merge pull request #2849 from jamtur01/supervisor
Andy Rothfusz
2013-11-25 13:50:44 -08:00
88286721b0Merge pull request #2836 from fj/topic/spinx⇒sphinx
Andy Rothfusz
2013-11-25 13:40:26 -08:00
e6304d10ddMerge pull request #2835 from fj/topic/update-native-installation-instructions
Andy Rothfusz
2013-11-25 13:28:18 -08:00
2a6a9722d8Merge pull request #2833 from twillouer/patch-1
Andy Rothfusz
2013-11-25 13:21:50 -08:00
0d748580b7Merge pull request #2848 from pnasrat/713-data-races
Victor Vieux
2013-11-25 12:07:01 -08:00
ae2b7fc016Reduce debugf frequency to avoid terminal freeze Upstream-commit: 78d2e2dc373a30eed2bd9f9bb140aa1e153c00f0 Component: engine
Guillaume J. Charmes
2013-11-25 12:06:16 -08:00
f0926e8de2Fix data race in TestLogEvent
Paul Nasrat
2013-11-25 13:58:17 -05:00
524c1ee04bMerge pull request #68 from crosbymichael/daemon-docs
Guillaume J. Charmes
2013-11-25 11:06:28 -08:00
8d1f8e4c83Added a Supervisor process management example Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0 Component: engine
James Turnbull
2013-11-25 14:05:01 -05:00
e80dc59739Merge pull request #71 from crosbymichael/fix-dummy-import
Guillaume J. Charmes
2013-11-25 10:30:20 -08:00
b1b08f39e6Rename dummy in driver.go to vfs Upstream-commit: 8b0b10b6f9fa152346e62b5dad1f4d430ae0e4d1 Component: engine
Michael Crosby
2013-11-25 10:28:17 -08:00
9b82922439Merge pull request #67 from crosbymichael/driver-flag
Guillaume J. Charmes
2013-11-25 09:45:31 -08:00
5c5c144532Add daemon docs with selecting graph driver Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4 Component: engine
Michael Crosby
2013-11-22 14:46:07 -08:00
93120354fdChange graph-driver flag to be s Upstream-commit: b4eeb6be617d96132cbd5998a658e5ab88334940 Component: engine
Michael Crosby
2013-11-22 14:17:24 -08:00
d197a9d049Merge pull request #69 from crosbymichael/rename-dummy
Guillaume J. Charmes
2013-11-25 09:42:50 -08:00
1e5b210a39Merge pull request #70 from codeaholics/use-https-url-in-dockerfile
Michael Crosby
2013-11-25 09:17:35 -08:00
06f0b3f336Merge pull request #2730 from SvenDowideit/docker-insert-doc
Andy Rothfusz
2013-11-25 09:16:08 -08:00
3705ed705eClone LVM using https: instead of git:
Danny Yates
2013-11-25 17:12:18 +00:00
a54274e072Rename dummy driver to vfs Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482 Component: engine
Michael Crosby
2013-11-22 14:58:19 -08:00
cb6dcf84c7Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
Tianon Gravi
2013-11-24 20:00:39 -07:00
15e852d771Add unit test for awesomeness of generated container names Upstream-commit: 07180f3aa75377b4c3227da006df00ec4f032589 Component: engine
Solomon Hykes
2013-11-25 00:25:15 +00:00
057091b3c5Add Ada Lovelace to the names generator (thanks James Turnbull) Upstream-commit: a60647482533fcc76b80919b46aab60e4296b924 Component: engine
Solomon Hykes
2013-11-25 00:16:56 +00:00
467ed87c8cNew collection of random names for 0.7: mood + famous inventor. Eg. 'sad-tesla' or 'naughty-turing' Upstream-commit: 5d6ef3177b57371c2dd9b9e4253fbc326d072554 Component: engine
Solomon Hykes
2013-11-24 04:41:26 +00:00
51f543bb50Corrects misspellings of 'Sphinx' Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd Component: engine
John Feminella
2013-11-23 16:21:27 -05:00
800614c9baSuggest users install dependencies by using requirements.txt, not manually Upstream-commit: f1b3e278b964fca4884dca80ffbe79c0e82a85ca Component: engine
John Feminella
2013-11-23 15:53:50 -05:00
a62fb77dd4be very explicit about docker insert - it does not insert a file into an IMAGE, it creates a new image that adds only that file to its specified parent Upstream-commit: e288e7763e20d1d8c7b8f5f9fffa00136577ed95 Component: engine
Sven Dowideit
2013-11-16 21:03:52 +10:00
7ee06b046badd 'to STDOUT' to the help, and add a simple eg that mentions it too Upstream-commit: 9696ec509a53afaaf9b761b00f60e517634f7e4e Component: engine
Sven Dowideit
2013-11-16 20:33:17 +10:00
2f447b8d32add more searchable info to the error message when ADD tries to go outside the context Upstream-commit: 96b5be9dd9606a9bfbf0fdbe98bcaf8b6e77e4b1 Component: engine
Sven Dowideit
2013-11-14 15:19:31 +10:00
a3e03a0c52Merge pull request #2827 from dotcloud/2778-fix-shell-corrupt
Guillaume J. Charmes
2013-11-22 15:46:02 -08:00
ce1c3dbb0aMake a validation on links name Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d Component: engine
Guillaume J. Charmes
2013-11-22 14:33:25 -08:00
d6ea186ed7Remove goroutine leak. Make sure termcap are reset each time. Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073 Component: engine
Guillaume J. Charmes
2013-11-22 14:09:37 -08:00
627f045fffMerge branch 'master' into 0.6.5-dm-plugin Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4 Component: engine
Michael Crosby
2013-11-22 14:06:59 -08:00
a684772eabMerge pull request #56 from shykes/creack-dm-plugin
Victor Vieux
2013-11-22 14:05:59 -08:00
c220f2eacdMerge pull request #2822 from dotcloud/better_port_help
Victor Vieux
2013-11-22 13:59:35 -08:00
a1d40e81caUse variable to call functions in devmapper_wrapper + some formatting Upstream-commit: 79e2b33ede415736f9124089a61f4512c16ddddd Component: engine
Guillaume J. Charmes
2013-11-20 11:39:15 -08:00
4a4a051d8aUse a constant for PortSpecTemplate + display the template in the CmdRun help Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7 Component: engine
Guillaume J. Charmes
2013-11-22 10:36:49 -08:00
c04337f42eReformatting parseRun and partParse Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7 Component: engine
Guillaume J. Charmes
2013-11-22 10:12:27 -08:00
7c2bc2f42bMerge pull request #2769 from vbatts/none_bridge
Michael Crosby
2013-11-22 11:48:33 -08:00
d8bc0d9debMerge pull request #2823 from dotcloud/2817-run_rm-fix
Michael Crosby
2013-11-22 11:35:29 -08:00
51748282f3Merge pull request #2677 from mrallen1/fix/2627
Guillaume J. Charmes
2013-11-22 11:30:16 -08:00
92b39790edfix the nil pointer panic on closing a disabled network manager Issue #2768 Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444 Component: engine
Vincent Batts
2013-11-22 14:28:49 -05:00
170040a202Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements Upstream-commit: 37e00831691567e30365c9e9ced5aa90a70f6221 Component: engine
Tianon Gravi
2013-11-22 11:39:40 -07:00
65390c08cePass terminal setting to display utils Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737 Component: engine
Mark Allen
2013-11-12 23:31:45 -06:00
2e819ef8cffixes#2671, add support for bind mounting individual files in to containers, rebases of #1757#2301 Upstream-commit: 0198f8a879df8506189cf3024c4b64c9ea8f6aa6 Component: engine
daniel-garcia
2013-11-19 17:27:01 -06:00
cacce7d99bAdd new tgz bundlescript to default make and release Upstream-commit: b3f5973f41eeb0e445b16ec0813b7996fba2fde7 Component: engine
Tianon Gravi
2013-11-17 20:25:08 -07:00
c1747d1722Add new bundlescript to build a tgz Upstream-commit: 3314e005f32f7440f1cc9009b0a453eed45ce9de Component: engine
Tianon Gravi
2013-11-17 20:24:49 -07:00
3f82c6cf46Merge pull request #2812 from dotcloud/bump_v0.6.7
Victor Vieux
2013-11-21 18:21:19 -08:00
b6a189d6eaMerge pull request #2812 from dotcloud/bump_v0.6.7
Victor Vieux
2013-11-21 18:21:19 -08:00
89913b0834Bump version to v0.6.7 Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2 Component: engine
Victor Vieux
2013-11-21 17:51:28 -08:00
5327f28322Merge branch 'master' into bump_v0.6.7 Upstream-commit: 9dc59797e09a20869d99e72f9c849e4e0b2c59bc Component: engine
Victor Vieux
2013-11-21 17:40:29 -08:00
cf914fd88cMerge branch 'master' into 0.6.5-dm-plugin
Michael Crosby
2013-11-21 17:18:41 -08:00
6ea3214afaMerge pull request #62 from shykes/devmapper-unit-tests
Michael Crosby
2013-11-21 16:54:50 -08:00
eec0335af0Use UTC for time Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2 Component: engine
Guillaume J. Charmes
2013-11-21 16:41:41 -08:00
b82d2b8801Merge pull request #2798 from dotcloud/fix_state_race
Michael Crosby
2013-11-21 16:39:50 -08:00
915356af08Refactor State to be 100% thread safe Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220 Component: engine
Guillaume J. Charmes
2013-11-21 12:21:03 -08:00
26fbc2e027Forbid syscalls in tests, add 2 new unit tests Upstream-commit: bc82940a575944e4686db203356a8a3fb3a75217 Component: engine
Guillaume J. Charmes
2013-11-21 16:32:16 -08:00
0e00966e8fMerge pull request #2678 from cxmcc/minor
Michael Crosby
2013-11-21 16:27:15 -08:00
8c720af218Merge pull request #2488 from viirya/fix_container_volumes_delete
Michael Crosby
2013-11-21 16:20:22 -08:00
b7afbe130dMerge pull request #2304 from unclejack/fix_layer_size_computation
Michael Crosby
2013-11-21 16:10:24 -08:00
4718170d22Merge pull request #2731 from SvenDowideit/docker-commit-doc
Victor Vieux
2013-11-21 15:33:05 -08:00
cbf3a12f02Update test scripts to always run ALL tests, even when some fail Upstream-commit: f1e6dce047d091bc4b4ea9264a29401f39381fa6 Component: engine
Tianon Gravi
2013-11-21 16:19:19 -07:00
de93f1b190Merge pull request #2772 from bitoiu/patch-3
Andy Rothfusz
2013-11-21 15:15:04 -08:00
1eafcb9d5eMerge pull request #2717 from metalivedev/2342-uploadingcontext
Andy Rothfusz
2013-11-21 15:09:47 -08:00
96fa8485acMerge pull request #2799 from rosenhouse/patch-1
Andy Rothfusz
2013-11-21 14:40:33 -08:00
e859413830Merge pull request #2763 from dotcloud/use_full_id_delete
Guillaume J. Charmes
2013-11-21 14:39:38 -08:00
5db9d5c4bdMerge pull request #2805 from pmorie/typo
Guillaume J. Charmes
2013-11-21 14:35:07 -08:00
f8ba7a65e3Fix typo in pullImage Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671 Component: engine
Paul Morie
2013-11-21 17:29:03 -05:00
a0108629acAdd support for compiling using make.sh without '.git' (ie, from a Github tarball, for example) Upstream-commit: efd0e13ca7e11e6422faf63986f443fe0df0cece Component: engine
Tianon Gravi
2013-11-21 15:11:17 -07:00
68f143de04Merge pull request #2794 from dotcloud/fix_status_code_and_usage
Guillaume J. Charmes
2013-11-21 13:48:38 -08:00
63c337d326Fix title on doc page for remote_api_client_libraries.rst Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a Component: engine
Gabe Rosenhouse
2013-11-21 12:45:01 -08:00
5aa6161466Merge pull request #2797 from crosbymichael/revert-exit-lock
Guillaume J. Charmes
2013-11-21 12:19:23 -08:00
9dfa0ceb9cRevert "Lock state before we modify."
Michael Crosby
2013-11-21 12:11:25 -08:00
06096928ccReturn status exit status 2 on usage, move parserun into commands.go, display usage on stderr Upstream-commit: 75a7f4d90cde0295bcfb7213004abce8d4779b75 Component: engine
Victor Vieux
2013-11-20 17:41:25 -08:00
9331f255c0Merge pull request #63 from tianon/flag-help-consistency
Victor Vieux
2013-11-21 11:31:34 -08:00
cdba895115Update a few flag help strings for consistency and clarity Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c Component: engine
Tianon Gravi
2013-11-21 00:12:07 -07:00
ef47b4e273Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
Victor Vieux
2013-11-21 11:28:02 -08:00
a3c4139aadUpdate ImageExport after merge fail Upstream-commit: 253214f07da1a58931e6a256c351105eb2eee8bc Component: engine
Michael Crosby
2013-11-21 10:26:21 -08:00
ebbbc781a4Merge branch 'master' into 0.6.5-dm-plugin Upstream-commit: a2c9d2da93e5106b82e8f3951947a90508a8f430 Component: engine
Michael Crosby
2013-11-21 10:21:30 -08:00
7a482f2a8cLock state before we modify.
Paul Nasrat
2013-11-21 08:06:02 -05:00
3152efa2baMerge pull request #2793 from crosbymichael/offline-ids
Victor Vieux
2013-11-21 02:44:00 -08:00