Jonathan Rudenberg
|
dabac81824
|
Update AUTHORS
|
2013-10-08 23:51:38 -04:00 |
|
Solomon Hykes
|
2d425af1b1
|
Merge pull request #2103 from tianon/clean-out-fixme
Clean out a few outdated FIXME items
|
2013-10-07 15:19:01 -07:00 |
|
Andy Rothfusz
|
ed19693f50
|
Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace
Cleanup whitespace in API 1.5 docs
|
2013-10-07 13:23:55 -07:00 |
|
Andy Rothfusz
|
194c1dbbd8
|
Merge pull request #2109 from shamrin/patch-4
[docs] use angle brackets in MAINTAINER example email
|
2013-10-07 12:18:44 -07:00 |
|
Alexey Shamrin
|
a9eac7eab4
|
[docs] use angle brackets in MAINTAINER example email
|
2013-10-07 20:29:54 +04:00 |
|
Ben Toews
|
7c28683f08
|
Cleanup whitespace in API 1.5 docs
remove whitespace on blank lines
|
2013-10-06 19:52:18 -06:00 |
|
Daniel Mizyrycki
|
c18e849451
|
Merge pull request #2061 from dotcloud/1948-test-detach
testing, issue #1948: Increase TestRunDetach timeout
|
2013-10-06 13:26:44 -07:00 |
|
Tianon Gravi
|
a665517151
|
Clean out a few outdated FIXME items
|
2013-10-06 13:55:26 -06:00 |
|
Andy Rothfusz
|
863eebe7bd
|
Merge pull request #2084 from makeusabrew/patch-1
Fix help text for -v option
|
2013-10-04 09:29:56 -07:00 |
|
Nick Payne
|
3c5350ba92
|
Fix help text for -v option
|
2013-10-04 10:26:57 +01:00 |
|
Tianon Gravi
|
c52c95f97f
|
Merge pull request #1876 from asbjornenge/master
Added Dockerfile.tmLanguage to contrib
|
2013-10-03 23:52:37 -07:00 |
|
Asbjørn Enge
|
85a5139665
|
Added Dockerfile.tmLanguage to contrib
|
2013-10-04 08:45:15 +02:00 |
|
Michael Crosby
|
ad4b09cdb8
|
Merge pull request #1832 from dotcloud/26-default_r_flag
Autorestart containers by default
|
2013-10-03 15:59:58 -07:00 |
|
Victor Vieux
|
e594c788e4
|
keep -r, but default true
|
2013-10-03 22:42:35 +00:00 |
|
Michael Crosby
|
826aaa0e9b
|
Merge pull request #1990 from modcloth-labs/more-tests-for-auth-registry-resolution
Adding more tests around `auth.ResolveAuthConfig`
|
2013-10-03 14:45:02 -07:00 |
|
Andy Rothfusz
|
ff4f32d58f
|
Fix #2017 Merge branch '2017-api-details'
|
2013-10-02 18:20:44 -07:00 |
|
Andy Rothfusz
|
462ac1efcf
|
Merge branch 'hint-api-details' of git://github.com/cdunklau/docker into 2017-api-details
Conflicts:
docs/sources/api/docker_remote_api.rst
|
2013-10-02 18:18:46 -07:00 |
|
Solomon Hykes
|
1332f400f7
|
Merge pull request #2015 from dsissitka/1927
Configured FPM to make /etc/init/docker.conf a config file.
|
2013-10-02 18:18:16 -07:00 |
|
Solomon Hykes
|
a292c04ddb
|
Merge pull request #2069 from philips/add-xz-to-runtime-dependencies
fix(hack/PACKAGERS): add xz utils as a runtime dep
|
2013-10-02 17:37:56 -07:00 |
|
Andy Rothfusz
|
37c4513cf9
|
Merge pull request #2060 from mastahyeti/patch-1
Add `apt-get install curl` to Ubuntu docs
|
2013-10-02 16:46:00 -07:00 |
|
Andy Rothfusz
|
b584c21ca4
|
Merge pull request #2063 from dhrp/doc-template-fix
Doc template fix
|
2013-10-02 16:31:47 -07:00 |
|
Andy Rothfusz
|
c92507341d
|
Merge pull request #2073 from tianon/gentoo-no-more-1422-hack
Remove Gentoo install notes about #1422 workaround
|
2013-10-02 16:24:11 -07:00 |
|
Andy Rothfusz
|
9f0feaa2e1
|
Merge pull request #2065 from kyleconroy/fix_ping_endpoint
Fix Ping endpoint documentation
|
2013-10-02 16:22:49 -07:00 |
|
Ben Toews
|
0f830aa431
|
Update ubuntu docs to use wget instead of curl
Ubuntu doesn't come with curl.
wget instead of curl
nicer wget syntax
remove /dev/null
|
2013-10-02 16:27:34 -06:00 |
|
Tianon Gravi
|
5f05cb4817
|
Remove Gentoo install notes about #1422 workaround
|
2013-10-02 16:06:22 -06:00 |
|
Michael Crosby
|
4778039dd2
|
Merge pull request #2066 from tianon/vendor-bump-kr-pty
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
|
2013-10-02 14:44:07 -07:00 |
|
Guillaume J. Charmes
|
b180770b1d
|
Merge pull request #2014 from alexlarsson/allow_set_file_cap
* Runtime: lxc: Allow set_file_cap capability in container
|
2013-10-02 14:38:50 -07:00 |
|
Brandon Philips
|
4f5c2cbccc
|
fix(hack/PACKAGERS): add xz utils as a runtime dep
|
2013-10-02 12:06:19 -07:00 |
|
Andy Rothfusz
|
c3acd9bece
|
Merge pull request #2047 from Thermionix/patch-1
Update archlinux.rst
|
2013-10-02 10:57:48 -07:00 |
|
Tianon Gravi
|
cb21a40490
|
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
|
2013-10-01 19:48:50 -06:00 |
|
Thatcher Peskens
|
5025b4d094
|
Cleanup
|
2013-10-01 16:32:56 -07:00 |
|
Thatcher Peskens
|
509e25cf04
|
Add/modified the canonical link to work with all /index/ links. Added style for "danger'
|
2013-10-01 16:26:14 -07:00 |
|
Daniel Mizyrycki
|
135c1fce90
|
testing, issue #1948: Increase TestAttachDetach and TestRunDetach timeout
|
2013-10-01 15:59:52 -07:00 |
|
Kyle Conroy
|
d517fd3d77
|
Fix Ping endpoint documentation
|
2013-10-01 15:49:32 -07:00 |
|
Michael Crosby
|
b4e1b8d2e2
|
Merge pull request #2058 from marcusramberg/patch-1
Fix ironic typo in changelog
|
2013-10-01 09:58:32 -07:00 |
|
Marcus Ramberg
|
45bd52d472
|
Fix ironic typo in changelog
|
2013-10-01 18:16:10 +02:00 |
|
Andy Rothfusz
|
534a991cff
|
fix logo path
|
2013-09-30 16:54:04 -07:00 |
|
Solomon Hykes
|
23015fa14d
|
Merge pull request #1994 from metalivedev/1993-legalcontext
Fix #1993: add explanation for export restrictions
|
2013-09-30 16:33:46 -07:00 |
|
Thermionix
|
fb46d911c2
|
Update archlinux.rst
|
2013-10-01 09:33:12 +10:00 |
|
Tianon Gravi
|
85b776995c
|
Merge pull request #2051 from tianon/hack-dockerfile-refactor
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
|
2013-09-30 16:29:32 -07:00 |
|
Thatcher
|
fa44555fb4
|
Merge pull request #2035 from dhrp/style-revamp
Changes to a new style for the docs. Includes version switcher.
|
2013-09-30 15:51:43 -07:00 |
|
Andy Rothfusz
|
3e7c50e8a1
|
Merge pull request #2033 from metalivedev/1969-cherrypick-fixcommitformat
Fix #1969 formatting, add information about multiline json
|
2013-09-30 14:55:11 -07:00 |
|
Tianon Gravi
|
ccefe47897
|
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
|
2013-09-30 13:57:30 -06:00 |
|
Tianon Gravi
|
ff85031980
|
Merge pull request #2039 from tianon/mkimage-centos
Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
|
2013-09-30 10:51:06 -07:00 |
|
Guillaume J. Charmes
|
017ecefd66
|
Merge pull request #2046 from dotcloud/2030-dockercfg_panic_err-fix
- Runtime: fix panic with wrong dockercfg file
|
2013-09-30 10:02:12 -07:00 |
|
Thermionix
|
88f710f0e7
|
Update archlinux.rst
The /etc/sysctl.conf file is deprecated
https://www.archlinux.org/news/deprecation-of-etcsysctlconf/
|
2013-09-30 22:44:09 +10:00 |
|
Victor Vieux
|
6496059154
|
fix panic with wrong dockercfg file
|
2013-09-30 11:07:32 +00:00 |
|
Victor Vieux
|
bcce3cbdd1
|
Merge pull request #1995 from dotcloud/fix_attach_2
Fix the attach behavior with -i
|
2013-09-30 03:29:19 -07:00 |
|
Victor Vieux
|
bbf644ed62
|
Merge pull request #2025 from dotcloud/2020_add_dockercfg_doc
add .dockercfg doc
|
2013-09-30 03:21:46 -07:00 |
|
Tianon Gravi
|
d89ce09a76
|
Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
|
2013-09-28 07:54:34 -06:00 |
|