Michael Crosby
b5810facb7
Merge branch 'release'
...
Upstream-commit: 1e6370fd4b4547e278a352bfd37e8758f3375a1e
Component: engine
2013-09-24 19:54:06 -07:00
Solomon Hykes
14d5f1616b
Merge pull request #1968 from tianon/hack-build-instructions
...
* Hack: Add several of the small make.sh fixes from #1920 , and make the output more consistent and contributor-friendly
Upstream-commit: a59a66528baef4eb7593827515016814fdf1ef3e
Component: engine
2013-09-24 17:38:39 -07:00
Andy Rothfusz
e431d024f4
Merge pull request #1983 from blissdev/patch-1
...
various command fixes in postgres example
Upstream-commit: b048e9dffcbab35ed684f031f7ca874ea5a9325e
Component: engine
2013-09-24 14:03:48 -07:00
blissdev
fb1ac0f2c2
revert removal of slash betwixt user/repo
...
Upstream-commit: c000e6a7fce11aaddae916853cc551d4801c1f8e
Component: engine
2013-09-24 15:51:21 -05:00
Tianon Gravi
23abc9f334
Add several of the small make.sh fixes from #1920 , and make the output more consistent and contributor-friendly, since release instructions already exist in release.sh
...
Upstream-commit: aa3de0b8499f8f42e0414099b2397179df35358b
Component: engine
2013-09-24 14:36:20 -06:00
Michael Crosby
beff202e28
Merge pull request #1972 from dotcloud/bump_0.6.3
...
Bump to version v0.6.3
Upstream-commit: 648d759517b62ca751dc3506f7abce5e9fefc62d
Component: engine
2013-09-24 11:20:27 -07:00
Solomon Hykes
fa7d59102d
Merge pull request #1970 from dotcloud/cleanup-hack
...
Cleanup and reorganize docs and tooling for contributors and maintainers
Upstream-commit: 03fe5632d0bba0ce1c7436fe9d94b595069efc6e
Component: engine
2013-09-24 10:38:21 -07:00
Victor Vieux
918be128f6
Merge pull request #1982 from modcloth-labs/spelling-fix-for-the-word-protocol
...
Minor spelling correction of protocoll -> protocol
Upstream-commit: 7447867edd3d778fe8963e91cd42e82cf38a96b2
Component: engine
2013-09-24 07:40:21 -07:00
blissdev
6fd51a9a7d
use su instead of sudo
...
Upstream-commit: 17b7194d91ba91e044155edf7ae0a485c2dd9c0b
Component: engine
2013-09-24 02:25:16 -05:00
Jordan Arentsen
69887d2da0
various command fixes
...
Indicating the repository and tag should be separated by a space and not a '/'. Also fixed a quote typo.
Upstream-commit: 15ad2915b95bd13067691ed3c7dcab67f529d37f
Component: engine
2013-09-24 02:12:24 -05:00
Tianon Gravi
94f91b70ab
Merge pull request #1883 from tianon/mkimage-debian
...
Several small tweaks/fixes for contrib/mkimage-debian.sh
Upstream-commit: d6887b769cff4140915ea7f97a076aecec7a05f3
Component: engine
2013-09-23 22:44:16 -07:00
Tianon Gravi
57f2e4e14d
Add a few tweaks and fixes to contrib/mkimage-debian.sh
...
Add simple workaround for #1755 to contrib/mkimage-debian.sh
Add simple echo patch in contrib/mkimage-debian.sh to prevent init scripts from running during apt-get installs/updates
Add `apt-get clean` to mkimage-debian.sh for slightly smaller images
Add more small apt tweaks to mkimage-debian.sh thanks to @jpetazzo and @spahl
Upstream-commit: 10362870dbdd5063e62dde919f4bab764145d3e2
Component: engine
2013-09-23 22:39:57 -06:00
Dan Buch
0f5b1c7220
Minor spelling correction of protocoll -> protocol
...
Upstream-commit: a7db1254807307b0ac4d9bb0dc784d12caa54237
Component: engine
2013-09-23 23:14:42 -04:00
Solomon Hykes
45a3edf527
Hack: correct typo in release checklist
...
Upstream-commit: f6c64827c899b1fd737df0fcd018cc33dd9a91b9
Component: engine
2013-09-23 18:43:08 -07:00
Andy Rothfusz
7ae1ed533a
Merge pull request #1973 from metalivedev/1969-formatfix
...
Fix #1969 formatting, add information about multiline json
Upstream-commit: 30b759ffa979b9424a9b3db81f683db6b9a253c7
Component: engine
2013-09-23 13:17:55 -07:00
Michael Crosby
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
Tianon Gravi
8e947a6f47
Add @tianon to hack/MAINTAINERS
...
Upstream-commit: a4067b1b441fac478d2c745981c464390f73a357
Component: engine
2013-09-23 12:39:14 -06:00
Michael Crosby
423f17f388
Bump to version v0.6.3
...
Upstream-commit: b0a49a30c78e8cafecac455aa0a306ac1792a644
Component: engine
2013-09-23 11:29:11 -07:00
Andy Rothfusz
a34a99a3e4
Fix #1969 formatting, add information about multiline json
...
Upstream-commit: 6097644e4b79fec180173d7278da884ac0484b8a
Component: engine
2013-09-23 11:29:08 -07:00
Solomon Hykes
7057328389
Hack: update README
...
Upstream-commit: fa3837abf1fd796cf8142a62eaece8decfa2ec6b
Component: engine
2013-09-23 11:26:05 -07:00
Solomon Hykes
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
Solomon Hykes
4a859df333
Hack: update release checklist and reference it in REAMDE
...
Upstream-commit: 99377de7d2c48e25cb13928605c90ea40eab5b35
Component: engine
2013-09-23 11:26:04 -07:00
Solomon Hykes
d9a3a46bf0
hack/MAINTAINERS.md: a maintainer's manual.
...
Upstream-commit: 0ef5bcb17d77e575c808003856c7a6ed134b04f2
Component: engine
2013-09-23 11:26:04 -07:00
Solomon Hykes
02fca5dc5a
Hack: remove deprecated files
...
Upstream-commit: fd1c43f0e05133249ef441444a740b81db3b90ce
Component: engine
2013-09-23 11:26:03 -07:00
Michael Crosby
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
Michael Crosby
acea376687
Update tar dependency to newest version
...
Upstream-commit: cfbe76e5595b66e43447d6e1f3de40946af066f4
Component: engine
2013-09-23 09:59:04 -07:00
Victor Vieux
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
Daniel Mizyrycki
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
Michael Crosby
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Nick Stinemates
d78346d443
Fix minor typo
...
Changed to
Upstream-commit: cce6f00c0cc4439a943bad68498ddc4b6854b0d2
Component: engine
2013-09-20 16:31:57 -07:00
Michael Crosby
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
Guillaume J. Charmes
94c2057eff
Improve detach unit tests
...
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
2013-09-20 13:36:19 -07:00
Guillaume J. Charmes
bcb4cc4982
Fix attach issue
...
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
Victor Vieux
590fe6f79d
Merge pull request #1889 from dsissitka/fixhttpimport
...
Fixed HTTP imports.
Upstream-commit: a81393787f0c74426e48c358a8d295d7b87582c8
Component: engine
2013-09-20 03:06:04 -07:00
Michael Crosby
99d2e0befc
Only copy files and change permissions with non bindmount
...
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
Michael Crosby
b28da4e1a8
Modify repository name regex to match index
...
Upstream-commit: 5867f9e7614e5761fdee1f5b6a607ef4f8311d7f
Component: engine
2013-09-19 20:25:00 -07:00
Andy Rothfusz
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
Jim Alateras
f1871e0df3
Updated the section about extracting the binary
...
Upstream-commit: 3cf4b2c7c1729635170dd92f83461c9662d126e4
Component: engine
2013-09-20 10:00:30 +10:00
Jim Alateras
eb6c475efd
Updated the section about extracting the binary
...
Upstream-commit: d70cbbf1fc33f2291a686537ba5b57913809e586
Component: engine
2013-09-20 09:58:12 +10:00
Jim Alateras
35bc3934c6
Updated the section about extracting the binary
...
Upstream-commit: b7e7104e9293c0fd35bdb03d7f0cd00e7a90d615
Component: engine
2013-09-20 09:49:20 +10: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