 Solomon Hykes
|
21e81bd668
|
Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
Upstream-commit: fb3d60f27adba32ab60022298702a4376c1f4d0d
Component: engine
|
2013-11-26 05:05:15 +00:00 |
|
 Solomon Hykes
|
e93d18c432
|
Merge pull request #2861 from crosbymichael/fix-time-race-archive
Set consistent time for sample dir in archive test
Upstream-commit: 09b7b55e2c29c2106633d11f887e55d087fc70c6
Component: engine
|
2013-11-25 20:24:16 -08:00 |
|
 Michael Crosby
|
116f6db1b3
|
Set consistent time for sample dir in archive test
Upstream-commit: 0d1b5d767648ee6200a816786e51d23917bf0218
Component: engine
|
2013-11-25 19:58:14 -08:00 |
|
|
Michael Crosby
|
0b2f92e511
|
Merge pull request #2810 from dotcloud/use_utc_time
Use UTC for time
Upstream-commit: 2586c042ae676686eca41bedf5ea6f6d2530e908
Component: engine
|
2013-11-25 19:11:59 -08:00 |
|
|
Solomon Hykes
|
a9b6188d0b
|
Merge pull request #2858 from jamtur01/fedora
Added Fedora skeleton
Upstream-commit: 688e86c6256c31f283f58f353b832aeea8dfcf5d
Component: engine
|
2013-11-25 19:10:50 -08:00 |
|
 James Turnbull
|
62617e06d0
|
Added Fedora skeleton
Upstream-commit: 750d2d8d07069c54c0fbddf4ccd2ba10e9ba9dc9
Component: engine
|
2013-11-25 22:06:18 -05:00 |
|
 Guillaume J. Charmes
|
020e2aed63
|
Merge branch 'master' into use_utc_time
Conflicts:
image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
|
2013-11-25 19:01:13 -08:00 |
|
|
Solomon Hykes
|
acc5196685
|
Merge pull request #2609 from shykes/0.6.5-dm-plugin
Move aufs to a storage driver, add devicemapper and dummy drivers
Upstream-commit: 1d903da6fd89b0322f76bc91c07fd3dbe4d22099
Component: engine
|
2013-11-25 18:58:26 -08:00 |
|
|
Solomon Hykes
|
7102c4c81c
|
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
Upstream-commit: aaefb8c07cc39735250b0304f73f8cb0e19662bc
Component: engine
|
2013-11-26 02:45:32 +00:00 |
|
 Guillaume J. Charmes
|
af4e80f9eb
|
Merge pull request #2837 from shykes/0.7-names
New collection of random names for 0.7
Upstream-commit: b3959e69b5a7664daa59cd79b6e5ecae4cc835f1
Component: engine
|
2013-11-25 18:39:36 -08:00 |
|
|
Solomon Hykes
|
542c84c74e
|
Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
|
2013-11-26 02:00:25 +00:00 |
|
|
Solomon Hykes
|
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 |
|
|
Michael Crosby
|
f8a327d015
|
Merge pull request #72 from shykes/creack-reduce-debug
Reduce debugf frequency to avoid terminal freeze
Upstream-commit: 487b3d8a8c47a3528d73abf92312f5db392985fb
Component: engine
|
2013-11-25 15:50:07 -08:00 |
|
 Andy Rothfusz
|
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 |
|
|
Andy Rothfusz
|
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 |
|
 Eystein Måløy Stenberg
|
f9b4bbea9e
|
docker in-container process management with CFEngine
Upstream-commit: 937f52aef98ac61bca75ef25c16b79b5fafa58ff
Component: engine
|
2013-11-25 14:24:23 -08:00 |
|
|
Andy Rothfusz
|
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 |
|
|
Andy Rothfusz
|
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 |
|
|
Andy Rothfusz
|
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 |
|
|
Andy Rothfusz
|
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 |
|
 Victor Vieux
|
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 |
|
|
Guillaume J. Charmes
|
ae2b7fc016
|
Reduce debugf frequency to avoid terminal freeze
Upstream-commit: 78d2e2dc373a30eed2bd9f9bb140aa1e153c00f0
Component: engine
|
2013-11-25 12:06:16 -08:00 |
|
 Paul Nasrat
|
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 |
|
|
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 |
|
|
James Turnbull
|
8d1f8e4c83
|
Added a Supervisor process management example
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
|
2013-11-25 14:05:01 -05: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 |
|
|
Andy Rothfusz
|
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 |
|
 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 |
|
|
Solomon Hykes
|
15e852d771
|
Add unit test for awesomeness of generated container names
Upstream-commit: 07180f3aa75377b4c3227da006df00ec4f032589
Component: engine
|
2013-11-25 00:25:15 +00:00 |
|
|
Solomon Hykes
|
057091b3c5
|
Add Ada Lovelace to the names generator (thanks James Turnbull)
Upstream-commit: a60647482533fcc76b80919b46aab60e4296b924
Component: engine
|
2013-11-25 00:22:06 +00:00 |
|
|
Solomon Hykes
|
467ed87c8c
|
New collection of random names for 0.7: mood + famous inventor. Eg. 'sad-tesla' or 'naughty-turing'
Upstream-commit: 5d6ef3177b57371c2dd9b9e4253fbc326d072554
Component: engine
|
2013-11-25 00:22:06 +00:00 |
|
 William Delanoue
|
a92bcacbc2
|
Better copy/paste :)
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
|
2013-11-24 13:55:53 +01:00 |
|
 John Feminella
|
51f543bb50
|
Corrects misspellings of 'Sphinx'
Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd
Component: engine
|
2013-11-23 16:21:27 -05:00 |
|
|
John Feminella
|
800614c9ba
|
Suggest users install dependencies by using requirements.txt, not manually
Upstream-commit: f1b3e278b964fca4884dca80ffbe79c0e82a85ca
Component: engine
|
2013-11-23 15:53:50 -05:00 |
|
 Sven Dowideit
|
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 |
|
|
Sven Dowideit
|
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 |
|
|
Guillaume J. Charmes
|
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 |
|
|
Guillaume J. Charmes
|
63cc3164f1
|
Remove useless New*Opt functions, singleline Opt types
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
|
2013-11-22 14:42:30 -08:00 |
|
|
Guillaume J. Charmes
|
ce1c3dbb0a
|
Make a validation on links name
Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d
Component: engine
|
2013-11-22 14:33:25 -08:00 |
|
|
Guillaume J. Charmes
|
d6ea186ed7
|
Remove goroutine leak. Make sure termcap are reset each time.
Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073
Component: engine
|
2013-11-22 14:09:37 -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 |
|