ff01a9f153
Update "Binaries" installation language to point to distro packages first
...
Also, added a minor consistency update to our usage of "wget".
Upstream-commit: 65fcc81b426ced8f416da3260770705ac7c90580
Component: engine
2013-11-25 22:53:50 -07:00
c26d8165d4
Merge pull request #2864 from tianon/gentoo-docs
...
Update the Gentoo installation docs for 0.7+
Upstream-commit: 77f1362c6471bf60447a28c1d3c4abb45e5123c0
Component: engine
2013-11-25 21:42:14 -08:00
e6fb344369
Update the Gentoo installation docs for 0.7+
...
Upstream-commit: 4049359beeb8a253f07e6dbac213391a7b39f362
Component: engine
2013-11-25 22:40:24 -07:00
73eafb391f
Merge pull request #2862 from shykes/integration-tests-vfs
...
Improve integration tests with vfs driver
Upstream-commit: 7daefc9d3f32a0c154897528a468eea050510cde
Component: engine
2013-11-25 21:37:35 -08:00
7bbdc10a11
Merge pull request #2854 from dotcloud/copy_dockerinit
...
create a copy of dockerinit on new runtime to handle upgrades
Upstream-commit: d4c32b9015ab0e3dd61ace30ab7b9afd801a708a
Component: engine
2013-11-25 21:31:33 -08:00
18e7ca81c6
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
Upstream-commit: 8bd6127ab357a84bb95c8dc69373232549f2c96a
Component: engine
2013-11-25 21:29:14 -08:00
8a3d9c6cf3
Fix a race condition in the integration tests
...
Upstream-commit: 23022932440006aca0a954763bf8e3a5882f94d3
Component: engine
2013-11-26 05:28:00 +00:00
24154237f8
Merge pull request #2863 from jamtur01/instsort
...
Installation docs update
Upstream-commit: fd7ff6411dcf792222b8d5a87333df1e42d22a2c
Component: engine
2013-11-25 21:19:30 -08:00
d367eeb253
Installation docs update
...
* Updated TOC sort order
* Fixed some grammar in Rackspace doc
* Updated titles to remove Linux where not needed
Upstream-commit: 59f76bf1c707c01ea548c4f3f2fdfba74c764e63
Component: engine
2013-11-26 00:16:30 -05:00
caee8ff1ca
Fix a race condition in TestInterruptedRegister
...
Upstream-commit: 02cb7f45fa6f9a8899286431fa68bf1a9d0194d8
Component: engine
2013-11-26 05:05:15 +00:00
2a72640146
Always use the 'vfs' storage driver in integration tests. To test other drivers, we need a dedicated driver validation suite.
...
Upstream-commit: a93731374705188f1434001dd1deaf4af9c77fcd
Component: engine
2013-11-26 05:05:15 +00:00
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
30ac426721
Merge pull request #2860 from jamtur01/fedora2
...
Updated Fedora docs with simple placeholder
Upstream-commit: 5ff74e268d7dfddfa928d00221763b05d2cbfd61
Component: engine
2013-11-25 20:59:15 -08:00
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
db32c4ebfa
create a copy of dockerinit
...
Upstream-commit: 110c4f20434af89d81580670f2cec25b1e82633a
Component: engine
2013-11-25 20:21:54 -08:00
116f6db1b3
Set consistent time for sample dir in archive test
...
Upstream-commit: 0d1b5d767648ee6200a816786e51d23917bf0218
Component: engine
2013-11-25 19:58:14 -08:00
47f399ed6b
Updated Fedora docs
...
* Added warning to Fedora docs
Upstream-commit: 5242a49f3fe2c18ca38be4798869cdc7c306af22
Component: engine
2013-11-25 22:51:38 -05:00
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
a9b6188d0b
Merge pull request #2858 from jamtur01/fedora
...
Added Fedora skeleton
Upstream-commit: 688e86c6256c31f283f58f353b832aeea8dfcf5d
Component: engine
2013-11-25 19:10:50 -08:00
62617e06d0
Added Fedora skeleton
...
Upstream-commit: 750d2d8d07069c54c0fbddf4ccd2ba10e9ba9dc9
Component: engine
2013-11-25 22:06:18 -05:00
020e2aed63
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
2013-11-25 19:01:13 -08:00
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
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
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
542c84c74e
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
2013-11-26 02:00:25 +00:00
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
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
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
ae2b7fc016
Reduce debugf frequency to avoid terminal freeze
...
Upstream-commit: 78d2e2dc373a30eed2bd9f9bb140aa1e153c00f0
Component: engine
2013-11-25 12:06:16 -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
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
8d1f8e4c83
Added a Supervisor process management example
...
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
2013-11-25 14:05:01 -05:00
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
b1b08f39e6
Rename dummy in driver.go to vfs
...
Upstream-commit: 8b0b10b6f9fa152346e62b5dad1f4d430ae0e4d1
Component: engine
2013-11-25 10:28:17 -08:00
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
5c5c144532
Add daemon docs with selecting graph driver
...
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
2013-11-25 09:44:55 -08:00
93120354fd
Change graph-driver flag to be s
...
Upstream-commit: b4eeb6be617d96132cbd5998a658e5ab88334940
Component: engine
2013-11-25 09:43:32 -08:00
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
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
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
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
a54274e072
Rename dummy driver to vfs
...
Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482
Component: engine
2013-11-25 09:04:04 -08:00
15e852d771
Add unit test for awesomeness of generated container names
...
Upstream-commit: 07180f3aa75377b4c3227da006df00ec4f032589
Component: engine
2013-11-25 00:25:15 +00:00
