df618dc294
Merge pull request #2038 from tianon/mkimage-debian-fixes
...
Fix contrib/mkimage-debian.sh apt caching prevention
Upstream-commit: ee256ce6bfc08fbd6d04f5abd4c69f796145abb2
Component: engine
2013-10-10 17:59:17 -07:00
ae4bb19110
Merge pull request #2166 from pnasrat/document-approval
...
Clarify LGTM process to contributors.
Upstream-commit: 5fe699f8132a5b6d6f7c5a876f65416228ba9d37
Component: engine
2013-10-10 17:55:32 -07:00
38757f890c
Merge pull request #2159 from nathankleyn/fix-references-to-param-names
...
Small fixes to parameter names in docs for ADD command.
Upstream-commit: 7561e2570c8db781d9be04cdd0d57ec5c40c4a2c
Component: engine
2013-10-10 17:53:57 -07:00
cabafc4b2a
Merge pull request #2128 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: 640ca68e4f77ef46802ef70233b4f75ce2b3e52e
Component: engine
2013-10-10 16:40:33 -07:00
612ed2548f
Merge pull request #2164 from pnasrat/add-finished-time
...
* Runtime: Record termination time in state.
Upstream-commit: f9b9dfc82dcec3d5a1468318721a10a68f975686
Component: engine
2013-10-10 16:29:07 -07:00
72308eafdd
Merge pull request #2165 from jrydberg/master
...
- Registry: Use correct auth config when logging in.
Upstream-commit: c978f0fa5cd548fe672aacfc186da15b19ab3ef4
Component: engine
2013-10-10 16:28:46 -07:00
a0e0dc0bf5
Clarify LGTM process to contributors.
...
Upstream-commit: 310a1742604173ac88a052b04f0b117772ab63ff
Component: engine
2013-10-10 18:32:33 -04:00
e57f722bf3
Record termination time in state.
...
Supercedes pull #1946
Upstream-commit: 2eb404ab14ef4b70e101cbb43c124651553de5d2
Component: engine
2013-10-10 14:47:25 -04:00
10fc3f9886
Merge pull request #2155 from jdubois/patch-1
...
- Documentation: Corrected error in the package name
Upstream-commit: 60e426938e491a8b10b353bbeb67b2e3cbc3d439
Component: engine
2013-10-10 11:19:22 -07:00
843c777913
Small fixes to parameter names in docs for ADD command.
...
Upstream-commit: 8abd328f53a207bd7b560197927ca49f12d2c9c8
Component: engine
2013-10-10 12:14:18 +01:00
068d644efe
Corrected error in the package name
...
Upstream-commit: 152037f011de00cbe06069687024bc345c76b0c6
Component: engine
2013-10-10 10:10:33 +02:00
0aae080c92
Merge pull request #2144 from shamrin/patch-5
...
document what `vagrant up` is actually doing
Upstream-commit: 0367032bd174b279eb24f53b277f352833601bf4
Component: engine
2013-10-09 17:42:37 -07:00
f5bb2953bd
Merge pull request #2139 from metalivedev/2115-AUFScleanup
...
Fix #2115 Clean AUFS references.
Upstream-commit: edca9f7e9c704fdfd394429dc18d7e139883ebfe
Component: engine
2013-10-09 17:35:05 -07:00
a20f1f498c
Merge pull request #2125 from dotcloud/2099_rm-v_fix
...
- Runtime: fix `docker rm` with volumes
Upstream-commit: e19cc1e843d18aedad196be0dbe01515f4b0dc0b
Component: engine
2013-10-09 16:01:51 -07:00
59519a52dc
Merge pull request #2119 from SvenDowideit/2117-hardcoded-tmp-dir
...
use empty string so TempDir uses the OS's temp dir automatically (Closes...
Upstream-commit: feabce3bcc076c9bffeb99b3c210dd41d72fc85d
Component: engine
2013-10-09 16:00:40 -07:00
4d7c2bfb0d
Merge pull request #2133 from dotcloud/improve_tests
...
Make sure to close the network allocators
Upstream-commit: ded74b0bb37d328a8c1a69f1f9b9aca2bba58199
Component: engine
2013-10-09 15:45:16 -07:00
db700fabdd
Merge pull request #2145 from dotcloud/remove-panic-test
...
* Runtime: replace panic by log.Fatal in tests
Upstream-commit: ffee5faae8037cc352a1d5f0a5d7f2b7d38f6523
Component: engine
2013-10-09 15:37:08 -07:00
e754634d16
Merge pull request #2114 from metalivedev/2113-searchbump
...
Fix #2113 improve doc search results
Upstream-commit: c1bb33ea4d94d38b66f4e8582a584d12818d733a
Component: engine
2013-10-09 12:24:33 -07:00
a5787f2874
Clean up javascript comment.
...
Upstream-commit: 6545e53803a3f0d908510d87b350ca9641f50df2
Component: engine
2013-10-09 12:22:14 -07:00
2971930d8c
Merge pull request #2127 from titanous/close-body
...
Fix some error cases where a HTTP body might not be closed
Upstream-commit: d30806590c8436941e5c4f2349af61de0128c49e
Component: engine
2013-10-09 06:52:03 -07:00
177e714a8f
replace panic by log.Fatal in tests
...
Upstream-commit: 823174de4d1acb93613c1b5ba53873906f43f62c
Component: engine
2013-10-09 13:47:49 +00:00
d81c62612b
Merge pull request #1956 from tianon/bash-completion
...
Add proper bash completion for "docker push"
Upstream-commit: d5f9160441eac56448dbf8418e2f178ea2bcdd06
Component: engine
2013-10-09 05:47:55 -07:00
1671af4f28
document what vagrant up is actually doing
...
* don't mention outdated PPA that Vagrantfile doesn't use
* point to official Ubuntu installation instructions that Vagrant appears to be following; should be future proof
Upstream-commit: 37df1d92d8d2b167bb90bb82c086b947371d7497
Component: engine
2013-10-09 15:05:09 +04:00
4af9c06750
Update AUTHORS
...
Upstream-commit: dabac81824f8ab9ec0bd80f1fcaa026aa103b1e3
Component: engine
2013-10-08 23:51:38 -04:00
cb3a2394e0
Merge pull request #2130 from tianon/swap-contrib-maintainers
...
Swap contrib MAINTAINERS
Upstream-commit: bb62c281f57f7f36480b4d2f971105cad7df9f88
Component: engine
2013-10-08 17:57:52 -07:00
04766fa3d4
Merge pull request #2134 from tianon/contributing
...
Add devenvironment link to CONTRIBUTING.md
Upstream-commit: 3565bf8d005707f1d7cf9372c188aaa2d85d625c
Component: engine
2013-10-08 17:36:56 -07:00
65b5bca147
Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
...
Upstream-commit: f4c17a202b5f6021d48c3cb3342c37607b509630
Component: engine
2013-10-08 17:33:19 -07:00
d8303ba769
Add devenvironment link to CONTRIBUTING.md
...
Upstream-commit: 9a4b0b982393e0612fef70c37a04654ea46b4c1d
Component: engine
2013-10-08 16:48:19 -06:00
921ffe0649
Make sure to close the network allocators
...
Upstream-commit: 9107565d0634ea3eed3290c6c4b6c0f006fdefe8
Component: engine
2013-10-08 15:42:02 -07:00
eb4a3a8402
Swap contrib MAINTAINERS
...
Upstream-commit: 4fda3314d871a28e33b0d901d6ca3a6d987c8dfa
Component: engine
2013-10-08 15:15:58 -06:00
6dfdc03073
Fix some error cases where a HTTP body might not be closed
...
Refs #2126
Upstream-commit: e906485b07fbf32a2c38495651d907af6b229962
Component: engine
2013-10-08 15:35:00 -04:00
bbfd951535
fix rm -v
...
Upstream-commit: 1daf242c8bafa0447c099b0e49826667a8155c5c
Component: engine
2013-10-08 16:35:47 +00:00
537fcd112e
Use correct auth config when logging in.
...
Upstream-commit: 967010ae8c7eb2f6482a9245b42731b7ead61e4b
Component: engine
2013-10-08 06:46:29 +02:00
4878575100
use empty string so TempDir uses the OS's temp dir automatically ( Closes #2117 )
...
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
2013-10-08 13:24:20 +10:00
aa13b96b8a
Insert popularity and boost docs results.
...
Upstream-commit: 6d67ac2a1b93d6c95881cb2f17250a7a8279def6
Component: engine
2013-10-07 17:51:07 -07:00
22bcf655f6
Merge pull request #2103 from tianon/clean-out-fixme
...
Clean out a few outdated FIXME items
Upstream-commit: 2d425af1b1675cfc6399d99a2b00f8efc219d7a9
Component: engine
2013-10-07 15:19:01 -07:00
e57acec080
Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace
...
Cleanup whitespace in API 1.5 docs
Upstream-commit: ed19693f50dec769daaa1d2c4dd702d0421e5d6c
Component: engine
2013-10-07 13:23:55 -07:00
e8211a620d
Fix contrib/mkimage-debian.sh apt caching prevention
...
Upstream-commit: ee27444098aa91d69f8df6dd07139b9637719b1d
Component: engine
2013-10-07 13:41:10 -06:00
aca42d0e27
Merge pull request #2109 from shamrin/patch-4
...
[docs] use angle brackets in MAINTAINER example email
Upstream-commit: 194c1dbbd81571da12b66831f3bb29be8913f0ea
Component: engine
2013-10-07 12:18:44 -07:00
c5b5b5d5ad
[docs] use angle brackets in MAINTAINER example email
...
Upstream-commit: a9eac7eab4c9867114c94cace52d1c889c249293
Component: engine
2013-10-07 20:29:54 +04:00
a8d55bfe7b
Cleanup whitespace in API 1.5 docs
...
remove whitespace on blank lines
Upstream-commit: 7c28683f08a485916e748713b0697ea3eb84a9e2
Component: engine
2013-10-06 19:52:18 -06:00
8cca5d988d
Merge pull request #2061 from dotcloud/1948-test-detach
...
testing, issue #1948 : Increase TestRunDetach timeout
Upstream-commit: c18e849451a3f48cecb82a5747f131e310cb0433
Component: engine
2013-10-06 13:26:44 -07:00
0722c6f3b0
Clean out a few outdated FIXME items
...
Upstream-commit: a665517151911866285e5a72164c5f2d2f31ba65
Component: engine
2013-10-06 13:55:26 -06:00
d54ac9648d
Merge pull request #2084 from makeusabrew/patch-1
...
Fix help text for -v option
Upstream-commit: 863eebe7bd7d5f9ac9f49619643078ea540154ff
Component: engine
2013-10-04 09:29:56 -07:00
d30e1ed4d3
Fix help text for -v option
...
Upstream-commit: 3c5350ba922dd6611dab714db82cdd2d0210f5c5
Component: engine
2013-10-04 10:26:57 +01:00
3e9f502097
Merge pull request #1876 from asbjornenge/master
...
Added Dockerfile.tmLanguage to contrib
Upstream-commit: c52c95f97fe3a596d3114be88d5593f6fb8dba34
Component: engine
2013-10-03 23:52:37 -07:00
531e0dc8b0
Added Dockerfile.tmLanguage to contrib
...
Upstream-commit: 85a51396657945613141abb8a521e118db15afe3
Component: engine
2013-10-04 08:45:15 +02:00
52102a8dde
Merge pull request #1832 from dotcloud/26-default_r_flag
...
Autorestart containers by default
Upstream-commit: ad4b09cdb833e5ed423d033f5abb6a3b1d567082
Component: engine
2013-10-03 15:59:58 -07:00
3ce3024fa4
keep -r, but default true
...
Upstream-commit: e594c788e4f42d4878c1b3d16139db0291ed830c
Component: engine
2013-10-03 22:42:35 +00:00
c443ca5ca0
Merge pull request #1990 from modcloth-labs/more-tests-for-auth-registry-resolution
...
Adding more tests around `auth.ResolveAuthConfig`
Upstream-commit: 826aaa0e9bb9625fc8a1accfcc566f06baf0223f
Component: engine
2013-10-03 14:45:02 -07:00
