121a1998cc
tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
...
Upstream-commit: 7b95d410926bffa6d8f42095fa8b38e01a5ac67b
Component: engine
2013-11-27 13:19:06 +10:00
9d0c3761bc
Merge pull request #2887 from kleptog/master
...
Add mkseccomp.pl, helper script to make seccomp profiles.
Upstream-commit: 6344e6f258c7aef7d805b6ede8a94bde4372d7df
Component: engine
2013-11-26 15:24:35 -08:00
323783b03d
Add mkseccomp.pl, helper script to make seccomp profiles.
...
Upstream-commit: ab3a83c617ec5bfafee117ea0b6e92ce78bd46e5
Component: engine
2013-11-26 17:13:02 +01:00
c4d496c52c
Merge pull request #2884 from nikai3d/patch-1
...
fix typo in CONTRIBUTING.md
Upstream-commit: 8b99e4ed374b8048a548556a6ff97d2f2598a5f5
Component: engine
2013-11-26 07:40:49 -08:00
4c67203399
Merge pull request #2872 from goldmann/runtime_typo
...
Fix the 'but is not' typo
Upstream-commit: 17efa9dc2ddd50f686dc3092b6d2ae45aa39b303
Component: engine
2013-11-26 07:40:25 -08:00
7dd10871ef
fix typo in CONTRIBUTING.md
...
Upstream-commit: 76c71260f13af3005c2407e2a19a422741b97117
Component: engine
2013-11-26 16:13:39 +01:00
f587c327f7
Fix the 'but is not' typo.
...
Upstream-commit: 9c15322894152095539e41623ef33ec0ebdc6c3f
Component: engine
2013-11-26 11:18:50 +01:00
64a1f0700d
Merge pull request #2870 from dotcloud/fix-links-parsing
...
fix -link parsing
Upstream-commit: 06d5e25224f8e24cbf8fd367437789ec32f592ca
Component: engine
2013-11-26 00:09:09 -08:00
3a30422210
fix -link parsing
...
Upstream-commit: 009024ad6439fad28ab3a9d8db6b6844bfbba8c9
Component: engine
2013-11-26 00:05:46 -08:00
69e3f71f64
Merge pull request #2869 from dotcloud/fix-docker-pull-run
...
fix docker run on an unknown image
Upstream-commit: 18d08d0d427f6350b5742264f200475792f40c9f
Component: engine
2013-11-25 23:28:15 -08:00
8d3710fbe5
fix docker run on an unknown image
...
Upstream-commit: 0bb2c0b1d0f651e23c949381762fe79a45c58aeb
Component: engine
2013-11-25 23:20:36 -08:00
2f99c2efdc
Merge branch 'release'
...
Upstream-commit: 233ad38802174cc5a3458a34bebaf78472a348d1
Component: engine
2013-11-25 22:25:47 -08:00
278ec44cf0
Merge pull request #2857 from shykes/0.7-release
...
0.7 release
Upstream-commit: db28e839e0292a9d4c9c24b33c4267703baa6e5b
Component: engine
2013-11-25 22:14:33 -08:00
ae49d218bd
Add 0.7.0 Changelog entry, with notable high-level features since 0.6.0.
...
Upstream-commit: de30ffb2c3b9aa86a5abd6a40b661cec247c6dbd
Component: engine
2013-11-26 06:06:22 +00:00
16e900a1c2
Bump version file to 0.7.0
...
Upstream-commit: 5c5ee194cb383be42c0d0b9fc53114fa991de564
Component: engine
2013-11-26 06:06:22 +00:00
a9075c1b0d
Merge pull request #2868 from jamtur01/ubtfixes
...
Tidied up Ubuntu installation documentation
Upstream-commit: b6dd67c70779d42dc36dd662becb247b79a7c083
Component: engine
2013-11-25 22:05:36 -08:00
7d7d4a875e
Merge pull request #2867 from shykes/more-random-names
...
Add more moods and inventor names to random name generator
Upstream-commit: 740958dda7ec0efd6ba77a5dab892019d4755bd3
Component: engine
2013-11-25 22:04:29 -08:00
cf209a1700
Remove non-ascii characters from name generator
...
Upstream-commit: c38386d876aab1c1e3391de2180cb03f083f8955
Component: engine
2013-11-26 06:02:37 +00:00
36c5097638
Merge pull request #2866 from tianon/binaries-docs
...
Update "Binaries" installation language to point to distro packages first
Upstream-commit: 4267fb66efd36e0c8cf564feb1e6d570902c45b1
Component: engine
2013-11-25 22:00:20 -08:00
2136e5ee7f
Tidied up Ubuntu installation documentation
...
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
be70b4650a
Add more moods to random name generator
...
Upstream-commit: 60809a4f72984881e8a8dc07bf585f07975baf7d
Component: engine
2013-11-26 05:55:48 +00:00
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
174bb35f3e
Merge pull request #2865 from tianon/arch-docs
...
A couple tiny docs consistency fixes
Upstream-commit: 06cf8fee1b9b588e0096349e94a0cb95948c014e
Component: engine
2013-11-25 21:53:16 -08:00
1113ee60b9
Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them
...
Upstream-commit: c92dab0eb4db57fd880c7b0bbf84d7288d048fef
Component: engine
2013-11-25 22:48:51 -07:00
c090d6cc77
Update Arch Linux instructions to include warnings at the top like other "community" platforms
...
Upstream-commit: 6ad5b2bcf4d04a0314583b29f9280d8000c1ee5a
Component: engine
2013-11-25 22:47:15 -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
