Commit Graph

31631 Commits

Author SHA1 Message Date
8dca6b9f4e Merge pull request #1975 from tianon/patch-1
Add @tianon to hack/MAINTAINERS
Upstream-commit: 35ca35ffb613947a9b0f8215aedbe9e001c49720
Component: engine
2013-09-23 12:21:36 -07:00
8e947a6f47 Add @tianon to hack/MAINTAINERS
Upstream-commit: a4067b1b441fac478d2c745981c464390f73a357
Component: engine
2013-09-23 12:39:14 -06:00
423f17f388 Bump to version v0.6.3
Upstream-commit: b0a49a30c78e8cafecac455aa0a306ac1792a644
Component: engine
2013-09-23 11:29:11 -07:00
a34a99a3e4 Fix #1969 formatting, add information about multiline json
Upstream-commit: 6097644e4b79fec180173d7278da884ac0484b8a
Component: engine
2013-09-23 11:29:08 -07:00
7057328389 Hack: update README
Upstream-commit: fa3837abf1fd796cf8142a62eaece8decfa2ec6b
Component: engine
2013-09-23 11:26:05 -07:00
ca189d7192 Update maintainer's manual: every change should be done in a pull request.
Upstream-commit: baff72bc82281b7fa545e0782722b9804240cf6e
Component: engine
2013-09-23 11:26:05 -07:00
4a859df333 Hack: update release checklist and reference it in REAMDE
Upstream-commit: 99377de7d2c48e25cb13928605c90ea40eab5b35
Component: engine
2013-09-23 11:26:04 -07:00
d9a3a46bf0 hack/MAINTAINERS.md: a maintainer's manual.
Upstream-commit: 0ef5bcb17d77e575c808003856c7a6ed134b04f2
Component: engine
2013-09-23 11:26:04 -07:00
02fca5dc5a Hack: remove deprecated files
Upstream-commit: fd1c43f0e05133249ef441444a740b81db3b90ce
Component: engine
2013-09-23 11:26:03 -07:00
f1898819e5 Merge pull request #1967 from dotcloud/vendor-update-tar
Update tar dependency to newest version
Upstream-commit: dc06496dc8449604e71b43cb2cd3b83daa2205d7
Component: engine
2013-09-23 10:44:42 -07:00
acea376687 Update tar dependency to newest version
Upstream-commit: cfbe76e5595b66e43447d6e1f3de40946af066f4
Component: engine
2013-09-23 09:59:04 -07:00
775cc7de8b Merge pull request #1948 from dotcloud/fix_attach
Fix attach issue
Upstream-commit: 2fafe1efce32c7560151e036c43e0dddb7faaa14
Component: engine
2013-09-23 02:15:51 -07:00
0bf56a21bc use less reflection in command line method invocation
Upstream-commit: 181b9badddf3571da395509d152eb244d87b6883
Component: engine
2013-09-23 01:06:31 +01:00
2a3202f318 Merge pull request #1820 from dotcloud/1647-api-group
packaging, issue #1647: Add docker groupname on the package release
Upstream-commit: 8240e37b87b5af209053b5c95489378b9b78e4f6
Component: engine
2013-09-22 14:21:26 -07:00
f4fdcdb53f Merge pull request #1934 from dotcloud/host-permissions
Only copy files and change permissions with non bindmount
Upstream-commit: 23cf3c7a3318b893ea1dd50cc9f05d4705bcc6df
Component: engine
2013-09-22 09:40:52 -07:00
da0c0c9f58 Add proper bash completion for "docker push"
Upstream-commit: e37bb506286e7c3dfe29d7d237fa8b5c2304eabb
Component: engine
2013-09-20 21:22:51 -06:00
7142edef21 Merge pull request #1954 from metalivedev/1901-cherrypick-builddocker
1901 1929 1932 cherrypick to release and docs
Upstream-commit: 2819cfb3f372ac12317405ef0c7792db20da5951
Component: engine
2013-09-20 18:13:11 -07:00
834b632586 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: a479f7659d0d9fb01fafdfb5f9e816ab1b522acd
Component: engine
2013-09-20 18:06:27 -07:00
4d3718f903 Merge pull request #1932 from jcassee/patch-1
Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: b02a591f57f3b8944b0f7c6c004ba55a9938ddb8
Component: engine
2013-09-20 18:02:40 -07:00
e3a0cae46f Merge pull request #1901 from jalateras/update-contributring-docs
Fix #1664
Upstream-commit: c654075654840b8737dbf5e89ab4d7a303e893e5
Component: engine
2013-09-20 17:55:15 -07:00
557d9cbc5e Merge pull request #1952 from metalivedev/1909-cherrypick
Fix minor typo
Upstream-commit: 5a3dcbb3f6d4461d9403f8436f2974dfd4e3a525
Component: engine
2013-09-20 16:56:07 -07:00
d78346d443 Fix minor typo
Changed  to
Upstream-commit: cce6f00c0cc4439a943bad68498ddc4b6854b0d2
Component: engine
2013-09-20 16:31:57 -07:00
76b4037c8c Merge pull request #1949 from dotcloud/1895-registry-regex
Modify repository name regex to match index
Upstream-commit: 4db64111bd03fee44ad7cb868507937358568414
Component: engine
2013-09-20 14:03:50 -07:00
94c2057eff Improve detach unit tests
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
2013-09-20 13:36:19 -07:00
bcb4cc4982 Fix attach issue
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
721615e4c7 abord build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d
Component: engine
2013-09-20 12:46:24 +00:00
590fe6f79d Merge pull request #1889 from dsissitka/fixhttpimport
Fixed HTTP imports.
Upstream-commit: a81393787f0c74426e48c358a8d295d7b87582c8
Component: engine
2013-09-20 03:06:04 -07:00
99d2e0befc Only copy files and change permissions with non bindmount
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
b28da4e1a8 Modify repository name regex to match index
Upstream-commit: 5867f9e7614e5761fdee1f5b6a607ef4f8311d7f
Component: engine
2013-09-19 20:25:00 -07:00
7c4db68542 Merge pull request #1901 from jalateras/update-contributring-docs
Fix #1664
Upstream-commit: 6132f378e007c0af1932b24ce3c63e35461d13a4
Component: engine
2013-09-19 18:00:23 -07:00
f1871e0df3 Updated the section about extracting the binary
Upstream-commit: 3cf4b2c7c1729635170dd92f83461c9662d126e4
Component: engine
2013-09-20 10:00:30 +10:00
eb6c475efd Updated the section about extracting the binary
Upstream-commit: d70cbbf1fc33f2291a686537ba5b57913809e586
Component: engine
2013-09-20 09:58:12 +10:00
35bc3934c6 Updated the section about extracting the binary
Upstream-commit: b7e7104e9293c0fd35bdb03d7f0cd00e7a90d615
Component: engine
2013-09-20 09:49:20 +10:00
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
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
e372fe8afc Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4
Component: engine
2013-09-19 21:14:39 +02:00
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
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
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
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
0118da35aa Docs: remove reference to deprecated 'base' image
Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e
Component: engine
2013-09-19 10:25:30 -06:00
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
ed00bbf084 Update VERSION
Upstream-commit: fee61895f2a2abc307839d7764d042604bd1e2d8
Component: engine
2013-09-18 12:06:29 -07:00
4def626e15 Merge remote-tracking branch 'origin/release'
Upstream-commit: f6a78f89ba489f062ef9425cb75dba29d2ce59fc
Component: engine
2013-09-18 12:06:10 -07:00
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
cf28050cad Updated the dev environment document
Upstream-commit: 4054f31471dbb97e3786120baaa863e3a05e7c1a
Component: engine
2013-09-18 14:18:05 +10:00
83b27f0110 Further updates to the dev environment document
Upstream-commit: 76a07371c5ceda160f1491a4f6e060dda2f45242
Component: engine
2013-09-18 14:18:05 +10:00
1482328d42 Further updates to the dev environment document
Upstream-commit: 5d364fda3cc4f947487d6782e585d1391782817b
Component: engine
2013-09-18 14:18:05 +10:00
e537c86df2 Update the devenvironment document
Upstream-commit: 28311f61be35bf92557542ae6ffb4aab11539720
Component: engine
2013-09-18 14:18:05 +10:00
db02ee1460 Updated the dev environment document
Upstream-commit: 70b731735c810d9e179837eb8761a44fbe98f391
Component: engine
2013-09-18 12:41:12 +10:00