b543516556
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
container.go
2013-10-31 10:53:40 -07:00
e37a7d4981
Merge pull request #2305 from mzdaniel/1800-testing-dind
...
Testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-10-31 09:42:19 -07:00
15457febbb
Merge pull request #2481 from tmc/patch-1
...
Fix typo in redis doc
2013-10-31 01:24:04 -07:00
f77bbfca56
Fix typo
2013-10-31 00:07:58 -05:00
ca2bbe716c
add 0.6.5
2013-10-30 19:30:32 -07:00
13ab83a8a5
Reformat CHANGELOG.md
...
* Add line after headers
* Remove space before bullet points
* Fix ' character
* Create sub-headers
* Group add fix etc. Upper-case
* Use head to trac current progress
2013-10-30 19:30:32 -07:00
429c3108da
Merge pull request #2473 from dotcloud/remove-panic-from-name
...
Assign id as name when all else fails
2013-10-30 19:22:57 -07:00
bdbb0371a7
Merge pull request #1536 from griff/envfile
...
Runtime: Keep env variables out of the command line
2013-10-30 19:20:29 -07:00
c1c65f972a
Merge pull request #2470 from metalivedev/2369-docuncompress
...
Documenting decompression behavior.
2013-10-30 19:14:51 -07:00
4b8a176ee0
Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
...
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
2013-10-30 18:57:07 -07:00
4dfa28fb95
Merge pull request #2299 from tmc/master
...
Client: Add -notrunc and -q flags to docker history
RemoteAPI: Add size to history
2013-10-30 18:52:18 -07:00
8227ea35cf
Assign id as name when all else fails
2013-10-30 18:31:18 -07:00
1099d172a2
Add flags to history, add size flag
2013-10-30 19:41:20 -05:00
1c3a674444
Fixed problem with variables containing \n.
...
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
2013-10-31 01:19:32 +01:00
25c4c87c86
Support copying value from env with -e option.
2013-10-31 01:19:09 +01:00
26f4d6bf59
Fix #2369 by documenting decompression behavior.
2013-10-30 16:50:58 -07:00
be7eb4bfcb
Set environment variables using a file.
2013-10-31 00:48:12 +01:00
5eb472025a
Merge pull request #2456 from dotcloud/update_release_checklist.md
...
Update RELEASE-CHECKLIST.md to reflect new changes
2013-10-30 16:38:09 -07:00
bdd12bb703
Merge pull request #2274 from peterbraden/2137-docs
...
Re #2137 Note about vagrant dns in the test documentation
2013-10-30 16:32:35 -07:00
ef00317a70
Merge branch 'release' back to master
2013-10-30 16:09:02 -07:00
3ff845904d
set containers comm to true by default
2013-10-30 15:06:28 -07:00
ec488fa123
fix warning in build
2013-10-30 15:06:01 -07:00
d7fac67e0a
Merge pull request #2469 from dotcloud/hotfix_release2
...
Hotfix changes for default values in 0.6.5
2013-10-30 15:04:38 -07:00
f7c40a87f3
set containers comm to true by default
2013-10-30 14:48:19 -07:00
ee81405567
fix warning in build
2013-10-30 14:36:38 -07:00
23b3747945
Merge pull request #2467 from dotcloud/release_hotfix
...
0.6.5 hotfixes
2013-10-30 13:21:20 -07:00
1c7ca51f32
fix typos
2013-10-30 13:18:48 -07:00
1edde0e8a3
Update links and host integration documentation
2013-10-30 13:11:02 -07:00
596facd124
fix typos
2013-10-30 13:06:47 -07:00
4fd389eee5
fix remove root name and fix error messages
2013-10-30 13:06:43 -07:00
6a9fb81c57
improve error message
2013-10-30 13:06:39 -07:00
5fb6d6e47c
continue build on expose with :, but displays a warning
2013-10-30 13:06:34 -07:00
a4d97a4e80
Update links and host integration documentation
2013-10-30 11:59:05 -07:00
3362aaa4df
fix remove root name and fix error messages
2013-10-30 11:45:11 -07:00
8fa6e2b103
improve error message
2013-10-30 11:24:50 -07:00
b2503a72f1
continue build on expose with :, but displays a warning
2013-10-30 11:13:10 -07:00
bb662bc12c
Merge pull request #2466 from dotcloud/hot-fix-restart-public-mappings
...
Hotfix: Migrate public mappings after upgrade
2013-10-30 09:35:56 -07:00
79bf2c2b0e
Hotfix: Migrate public mappings after upgrade
2013-10-30 09:02:23 -07:00
746ba127bf
Hotfix: Migrate public mappings after upgrade
2013-10-30 08:15:12 -07:00
9420e8def7
update RELEASE-CHECKLIST.md to reflect new changes
2013-10-29 15:34:33 -07:00
4f6ce1ba9e
Merge pull request #2428 from dotcloud/bump_0.6.5
...
Bump to version 0.6.5
2013-10-29 14:56:54 -07:00
2a9c18af52
Merge pull request #2453 from dotcloud/remove_logs_from_tests
...
Testing: remove some logs from tests
2013-10-29 14:43:37 -07:00
86970d00bb
remove some logs from tests
2013-10-29 14:42:34 -07:00
da054148dc
Bump to version 0.6.5
2013-10-29 14:42:20 -07:00
0174951195
Merge branch 'master' into bump_0.6.5
2013-10-29 14:41:47 -07:00
caa7cf14c0
Merge pull request #2426 from dotcloud/enable_sigproxy_default
...
Enable sig-proxy by default in run and attach
2013-10-29 14:39:17 -07:00
700a71e6b6
stop proxy at one point
2013-10-29 14:29:01 -07:00
02e0fdee57
Merge pull request #2429 from SvenDowideit/add-more-doc-pointers
...
tell potential doc updaters and contributors more details
2013-10-29 14:07:12 -07:00
baf23d3c3e
Merge pull request #2443 from tlunter/fix_remote_api_doc
...
Container commit doesn't use a query parameter, uses POST body
2013-10-29 14:04:22 -07:00
5b75aea704
Merge pull request #2449 from tianon/remove-stackbrew-remnants
...
Remove old remnants of stackbrew now that it's a separate project
2013-10-29 14:00:33 -07:00
Zilin Du