|
|
e2736db53a
|
Merge pull request #2804 from tianon/fix-hack-git-assumption
Hack: add support for compiling using make.sh without '.git'
Upstream-commit: 6acdf68ee13ab5b1cd7f6e17aa85a181811a0eb9
Component: engine
|
2013-11-25 16:52:22 -08:00 |
|
|
|
c1bd7eb1b4
|
Merge pull request #2725 from SvenDowideit/docker-export-doc
add 'to STDOUT' to the help and give an example
Upstream-commit: 33f70f8978b175915fbc71b2e82694c911a69741
Component: engine
|
2013-11-25 14:42:57 -08:00 |
|
|
|
d05e72dea8
|
Merge pull request #2853 from estenberg/cfe-docker-process
docker in-container process management with CFEngine
Upstream-commit: 809239c0afdda01a7b0b5c0b2208b96a93dfc411
Component: engine
|
2013-11-25 14:31:52 -08:00 |
|
|
|
f9b4bbea9e
|
docker in-container process management with CFEngine
Upstream-commit: 937f52aef98ac61bca75ef25c16b79b5fafa58ff
Component: engine
|
2013-11-25 14:24:23 -08:00 |
|
|
|
2f62549ee3
|
Merge pull request #2849 from jamtur01/supervisor
Added a Supervisor process management example
Upstream-commit: aa48acc5ec6621a9fb720fa00772fb8eeaa2be7a
Component: engine
|
2013-11-25 13:50:44 -08:00 |
|
|
|
88286721b0
|
Merge pull request #2836 from fj/topic/spinx⇒sphinx
Corrects misspellings of 'Sphinx'
Upstream-commit: ac70e296dbc55a60bd8d6fce7b1fb4a260a91fb1
Component: engine
|
2013-11-25 13:40:26 -08:00 |
|
|
|
e6304d10dd
|
Merge pull request #2835 from fj/topic/update-native-installation-instructions
Use requirements.txt rather than manual installation for docs
Upstream-commit: e2c3860ec3c69acdda87959927ba3c4fccee4df9
Component: engine
|
2013-11-25 13:28:18 -08:00 |
|
|
|
2a6a9722d8
|
Merge pull request #2833 from twillouer/patch-1
Better copy/paste :)
Upstream-commit: 2d715bf3c0ce37e31553f35fbab2112df482c46d
Component: engine
|
2013-11-25 13:21:50 -08:00 |
|
|
|
0d748580b7
|
Merge pull request #2848 from pnasrat/713-data-races
Fix data race in TestLogEvent
Upstream-commit: d9e54e28e715cf4f689cf407618edc433494faa3
Component: engine
|
2013-11-25 12:07:01 -08:00 |
|
|
|
f0926e8de2
|
Fix data race in TestLogEvent
Found with -race. Improve locking on Server.
Upstream-commit: abfdaca3f86d7951693697fbd849078d6b406478
Component: engine
|
2013-11-25 14:17:58 -05:00 |
|
|
|
8d1f8e4c83
|
Added a Supervisor process management example
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
|
2013-11-25 14:05:01 -05:00 |
|
|
|
06f0b3f336
|
Merge pull request #2730 from SvenDowideit/docker-insert-doc
Be more explicit about what insert does.
Upstream-commit: 5da1ed32916feee87ed7d8ecec5cb04d5cbae682
Component: engine
|
2013-11-25 09:16:08 -08:00 |
|
|
|
a92bcacbc2
|
Better copy/paste :)
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
|
2013-11-24 13:55:53 +01:00 |
|
|
|
51f543bb50
|
Corrects misspellings of 'Sphinx'
Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd
Component: engine
|
2013-11-23 16:21:27 -05:00 |
|
|
|
800614c9ba
|
Suggest users install dependencies by using requirements.txt, not manually
Upstream-commit: f1b3e278b964fca4884dca80ffbe79c0e82a85ca
Component: engine
|
2013-11-23 15:53:50 -05:00 |
|
|
|
a62fb77dd4
|
be 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
|
2013-11-23 12:48:34 +10:00 |
|
|
|
7ee06b046b
|
add 'to STDOUT' to the help, and add a simple eg that mentions it too
Upstream-commit: 9696ec509a53afaaf9b761b00f60e517634f7e4e
Component: engine
|
2013-11-23 12:28:50 +10:00 |
|
|
|
a3e03a0c52
|
Merge pull request #2827 from dotcloud/2778-fix-shell-corrupt
2778 fix shell corrupt
Upstream-commit: ba6dd1d8d643f745fb412e1de50c9dbf0c63325e
Component: engine
|
2013-11-22 15:46:02 -08:00 |
|
|
|
63cc3164f1
|
Remove useless New*Opt functions, singleline Opt types
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
|
2013-11-22 14:42:30 -08:00 |
|
|
|
ce1c3dbb0a
|
Make a validation on links name
Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d
Component: engine
|
2013-11-22 14:33:25 -08:00 |
|
|
|
d6ea186ed7
|
Remove goroutine leak. Make sure termcap are reset each time.
Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073
Component: engine
|
2013-11-22 14:09:37 -08:00 |
|
|
|
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 |
|
|
|
6e7d75df95
|
Format CmdRun
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
|
2013-11-22 12:14:34 -08:00 |
|
|
|
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 |
|
|
|
c04337f42e
|
Reformatting parseRun and partParse
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
|
2013-11-22 11:58:02 -08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f1afbc9e5f
|
fix -rm
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
|
2013-11-22 11:23:48 -08:00 |
|
|
|
65390c08ce
|
Pass terminal setting to display utils
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
|
2013-11-22 00:05:55 -06:00 |
|
|
|
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 |
|
|
|
89913b0834
|
Bump version to v0.6.7
Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2
Component: engine
|
2013-11-21 18:03:41 -08:00 |
|
|
|
5327f28322
|
Merge branch 'master' into bump_v0.6.7
Upstream-commit: 9dc59797e09a20869d99e72f9c849e4e0b2c59bc
Component: engine
|
2013-11-21 17:40:29 -08:00 |
|
|
|
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 |
|
|
|
915356af08
|
Refactor State to be 100% thread safe
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
|
2013-11-21 16:34:58 -08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f8ba7a65e3
|
Fix typo in pullImage
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
|
2013-11-21 17:29:03 -05:00 |
|
|
|
a0108629ac
|
Add support for compiling using make.sh without '.git' (ie, from a Github tarball, for example)
Upstream-commit: efd0e13ca7e11e6422faf63986f443fe0df0cece
Component: engine
|
2013-11-21 15:11:17 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
