Guillaume J. Charmes
bcb4cc4982
Fix attach issue
...
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
Andy Rothfusz
fa2129e045
Merge pull request #1932 from jcassee/patch-1
...
Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 7e60a6b1ea946e942b6c592d0c4930fd01ae5bf4
Component: engine
2013-09-19 13:41:51 -07:00
Andy Rothfusz
787663083d
Merge pull request #1929 from tianon/gentoo-docs
...
Simplified Gentoo install instructions now that our overlay is in the official layman repositories.xml list
Upstream-commit: 45979a7ef7b83ea55f0591bb7f81191026773c40
Component: engine
2013-09-19 13:41:29 -07:00
Joost Cassee
e372fe8afc
Download Ubuntu 13.04 repository key over HTTPS
...
Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4
Component: engine
2013-09-19 21:14:39 +02:00
Guillaume J. Charmes
3eaff637a9
Merge pull request #1886 from dotcloud/multi-volumes-from
...
* Runtime: Allow multiple volumes-from
Upstream-commit: 68074fce68ebd3f0e6e7c648ddf72dcc96960096
Component: engine
2013-09-19 12:01:12 -07:00
Andy Rothfusz
73fa9ee1c4
Merge pull request #1914 from tianon/base-repository-is-deprecated
...
Removing the deprecated `base` repository from more docs
Upstream-commit: c42056b969a0094f225035f6d35e4337aabe9c41
Component: engine
2013-09-19 11:04:11 -07:00
Tianon Gravi
66d947d16e
Simplify install instructions now that our overlay is in the official repositories.xml list, and add note about hacky #1422 workaround
...
Upstream-commit: 341addeccd2100611af27797b38421c5a0ab066f
Component: engine
2013-09-19 11:49:43 -06:00
Tianon Gravi
cdb2ec7f94
Remove many remaining docs references to the deprecated base repository and several other minor doc cleanups
...
Upstream-commit: 47904290a563801b15eb204516f32c9517c11a47
Component: engine
2013-09-19 10:27:08 -06:00
Solomon Hykes
0118da35aa
Docs: remove reference to deprecated 'base' image
...
Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e
Component: engine
2013-09-19 10:25:30 -06:00
Andy Rothfusz
4165a8a92d
Merge pull request #1913 from metalivedev/1654-registryexamples
...
Fix #1654 Improve the introduction to repositories flow.
Upstream-commit: 77ad95d3724cf4b2ae2371d34b7197af08c9ba8c
Component: engine
2013-09-18 17:53:13 -07:00
Guillaume J. Charmes
ed00bbf084
Update VERSION
...
Upstream-commit: fee61895f2a2abc307839d7764d042604bd1e2d8
Component: engine
2013-09-18 12:06:29 -07:00
Guillaume J. Charmes
4def626e15
Merge remote-tracking branch 'origin/release'
...
Upstream-commit: f6a78f89ba489f062ef9425cb75dba29d2ce59fc
Component: engine
2013-09-18 12:06:10 -07:00
Daniel Mizyrycki
94980938ac
Merge pull request #1908 from dotcloud/bump_v0.6.2
...
Bump v0.6.2
Upstream-commit: 081543c49a2326015334ac7bda200345a8f48e3f
Component: engine
2013-09-18 11:21:51 -07:00
Andy Rothfusz
9c3ea618a8
Fix #1654 Improve the introduction to repositories flow.
...
Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341
Component: engine
2013-09-17 19:01:11 -07:00
Andy Rothfusz
38112bcad2
Merge pull request #1909 from dotcloud/fix-typo-docs
...
Fix minor typo
Upstream-commit: c14450ae5ce936b9e6516001ffe90d03614692e6
Component: engine
2013-09-17 18:25:59 -07:00
Nick Stinemates
7549ba84c7
Fix minor typo
...
Changed to
Upstream-commit: 593566438d16f3d666507218086d6c0aba78bb3e
Component: engine
2013-09-17 18:49:47 +00:00
Guillaume J. Charmes
ebc85df1e6
Bump version to 0.6.2
...
Upstream-commit: ca5913ff3ec0648d6ad9887abc6cf986fddee1a2
Component: engine
2013-09-17 11:11:39 -07:00
Solomon Hykes
bac45adcda
Merge pull request #1893 from dotcloud/add-tianon-maintainer
...
Add Tianon to contrib/ maintainers
Upstream-commit: 85f3ec88a62e4fd4e486402abc23bfad4ccd3c17
Component: engine
2013-09-17 11:00:48 -07:00
Michael Crosby
c56f8710d6
Merge pull request #1898 from dotcloud/smallfix_registry
...
Prevent panic upon error pulling registry
Upstream-commit: b2707dccc1e9dfe8cd8c27d962f9fb280f4f4705
Component: engine
2013-09-17 10:27:19 -07:00
Michael Crosby
57d4184f69
Merge pull request #1897 from dotcloud/update_doc
...
Update the commit documentation with better example
Upstream-commit: b8263513372d279750f65bc3c48ef0f326cab9fd
Component: engine
2013-09-17 10:21:45 -07:00
Andy Rothfusz
c55e3c6610
Information about data persistence
...
Upstream-commit: 2183644578c886e054a81c32b40720eafc2ce2b9
Component: engine
2013-09-16 16:44:54 -07:00
Guillaume J. Charmes
e26a79ce37
Prevent panic upon error pulling registry
...
Upstream-commit: e836b0064bc18300ca9213c749f464e52ca9d001
Component: engine
2013-09-16 16:18:25 -07:00
Michael Crosby
8218ba9d63
Merge pull request #1892 from dotcloud/fix-maintainers-files
...
Add MAINTAINERS
Upstream-commit: 986906cd7ba9dc1a66fff14287dca305d0a865a8
Component: engine
2013-09-16 14:41:36 -07:00
Michael Crosby
ea104a3973
Merge pull request #1894 from dotcloud/1891-remove_useless_warnings
...
Don't show network related warnings when networking is disabled
Upstream-commit: 8d481193407e8aa4b91c68a525839bb3556b06d0
Component: engine
2013-09-16 13:48:17 -07:00
Michael Crosby
f0c74e9f0a
Merge pull request #1896 from dotcloud/1885-missing-hostfile
...
Only mount hostname files if config exists
Upstream-commit: cdce873ea0093152b1b854b38e17491b72b8e615
Component: engine
2013-09-16 11:29:52 -07:00
Michael Crosby
ef0295b560
Only mount hostname files if config exists
...
Upstream-commit: 5a01f7485c6df95f747e08d2cad3d4c934b811bc
Component: engine
2013-09-16 17:53:24 +00:00
Michael Crosby
6deb994c66
Merge pull request #1849 from dotcloud/better_handle_hostConfig
...
Improved hostConfig reload
Upstream-commit: 45b50730e39ed5badad0a320e2163924117bdd71
Component: engine
2013-09-16 10:48:53 -07:00
Victor Vieux
613224b496
Don't show network related warnings when networking is disabled
...
Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48
Component: engine
2013-09-16 15:58:44 +00:00
Nick Stinemates
da2cdf809a
Add Tianon to contrib/ maintainers
...
He's awesome and always contributing to this area.
Upstream-commit: 9946981c61c5eeafc1a15930e064bce8b7032a71
Component: engine
2013-09-16 04:50:53 +00:00
Nick Stinemates
c157c0dfdc
Add MAINTAINERS
...
Making sure we're consistent across our project.
Upstream-commit: d6cf41cbe62ffaf2ed5bedf107d8bc4f804d3658
Component: engine
2013-09-16 04:45:01 +00:00
Michael Crosby
2e27a64777
Allow multiple volumes-from
...
Upstream-commit: b79bd4e864d53e927a9480374646d5e94d12141c
Component: engine
2013-09-14 20:09:15 +00:00
Solomon Hykes
c55f0d3dec
Merge pull request #1884 from dotcloud/update-vendored-deps
...
* Hack: Update vendored dependendies
Upstream-commit: 2f24b9e05c88941d4bcb41c67a7f4ca3ab02a839
Component: engine
2013-09-13 20:55:06 -07:00
Solomon Hykes
000c3ebd00
Merge pull request #1847 from dotcloud/test-docker-in-docker
...
* Hack: make the build tool more dev-friendly and packager-friendly
Upstream-commit: a63cfe7153fb5084604f8b52a33cc09d93878d4f
Component: engine
2013-09-13 20:19:37 -07:00
Andy Rothfusz
80d0a74f8b
clarify "use"
...
Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a
Component: engine
2013-09-13 17:22:53 -07:00
Andy Rothfusz
32f8da3a7e
Merge pull request #1880 from getvictor/patch-api
...
Fixed LxcConf example in Remote API v1.4 and v1.5
Upstream-commit: 894eff64b499b2df5d7eadca55f2ea2feee7c380
Component: engine
2013-09-13 13:28:26 -07:00
Andy Rothfusz
9fc7b61184
Merge pull request #1881 from dotcloud/ubuntu-install-instructions
...
Change apt source to http
Upstream-commit: 71e15d1c3cf2e0d80158709ece4601893db05fe6
Component: engine
2013-09-13 13:27:58 -07:00
Michael Crosby
4b16804ae0
Change apt source to http
...
Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be
Component: engine
2013-09-13 19:21:43 +00:00
getvictor
262f4e57a2
Fixing LxcConf example in docker_remote_api_v1.4.rst
...
Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e
Component: engine
2013-09-13 14:10:05 -05:00
getvictor
40a7f3c469
Fixed LxcConf example for docker_remote_api_v1.5.rst
...
Based on how command line docker sends the request.
Upstream-commit: b3cbf424ec7dbce8a42f75b23f48083f3f62abaf
Component: engine
2013-09-13 14:09:05 -05:00
Michael Crosby
4de754b9f6
Merge pull request #1848 from dotcloud/build-clean
...
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
2013-09-13 10:58:59 -07:00
Michael Crosby
dea87b774e
Merge pull request #1716 from eliasp/fixme
...
Added FIXME for iproute → netlink as advised in issue #925 .
Upstream-commit: 4234fc699f9ab30677131fc9b43a4ffd78cb7aa3
Component: engine
2013-09-13 10:58:28 -07:00
Solomon Hykes
ff91aa71a1
Add go.net to vendored dependencies
...
Upstream-commit: 4a707a8800f95c2d7c8ba269da7dcdfaba6acbc6
Component: engine
2013-09-13 10:24:38 -07:00
Michael Crosby
a0167b5a29
Merge pull request #1846 from dotcloud/fix_return_error
...
Fix wrong return error
Upstream-commit: b986fd00e074432c2f0d05655b4cf22c8d51b36f
Component: engine
2013-09-13 09:44:38 -07:00
Daniel Mizyrycki
c2de80738c
Merge pull request #1862 from dotcloud/dockerfile-multiline-space
...
Replace multiline with empty string not space
Upstream-commit: f368fd9f9f3fcd9904f766f2fd00b875847cc676
Component: engine
2013-09-13 08:52:57 -07:00
Solomon Hykes
5b4ca38251
Updated vendored dependencies
...
Upstream-commit: 6c1c404501d72c5c0ba488689b331ee0e01d5753
Component: engine
2013-09-12 20:42:26 -07:00
Guillaume J. Charmes
b5842137f7
Update the commit documentation with better example
...
Upstream-commit: 796d7a49f04de73c349d2a09f57922bc30961283
Component: engine
2013-09-12 13:26:31 -07:00
Michael Crosby
b9d752c34e
Merge pull request #1741 from griff/1737_fix_volume_uid_gid
...
Transfer uid and gid from image to volume
Upstream-commit: ffc850244f4450990eb1c2e13dc1f35c2d4772b4
Component: engine
2013-09-12 10:38:37 -07:00
Andy Rothfusz
dec68f5c30
Merge pull request #1593 from kyleconroy/master
...
Enable mobile view for website.
Upstream-commit: 83623675ceba17a5dcc283010f8e7f53f0910a4a
Component: engine
2013-09-12 10:30:16 -07:00
Andy Rothfusz
909728c3a8
Merge pull request #1865 from lgp171188/patch-1
...
Fixed a minor typo
Upstream-commit: 46f644c074ac2f0b30cba608db32995ee2f02551
Component: engine
2013-09-12 10:11:18 -07:00
Andy Rothfusz
bd04c634f0
Merge pull request #1859 from Bachmann1234/patch-1
...
Fix typo in hello_world.rst
Upstream-commit: 1bc2ab05ec244935a5219fdc827f62e911dee37a
Component: engine
2013-09-12 10:10:49 -07:00
Guillaume J. Charmes
Andy Rothfusz
Joost Cassee
Guillaume J. Charmes
Tianon Gravi
Solomon Hykes
Daniel Mizyrycki
Nick Stinemates
Michael Crosby
Victor Vieux
getvictor