5dfb155fe5
Fixes the password value in the redis/links example
...
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
2ea7830596
add 0.6.5
...
Upstream-commit: ca2bbe716c22d90410d388a710642f76f06826df
Component: engine
2013-10-30 19:30:32 -07:00
3ef06332af
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
Upstream-commit: 13ab83a8a5d5ebd97dc8490355c0b9064d8fe57c
Component: engine
2013-10-30 19:30:32 -07:00
7302345b08
Merge pull request #2473 from dotcloud/remove-panic-from-name
...
Assign id as name when all else fails
Upstream-commit: 429c3108daee9a9448ac7fa401fd1ad7525c3722
Component: engine
2013-10-30 19:22:57 -07:00
e034785968
Merge pull request #1536 from griff/envfile
...
Runtime: Keep env variables out of the command line
Upstream-commit: bdbb0371a76864eecd4c3059957417c4b582eba2
Component: engine
2013-10-30 19:20:29 -07:00
1e48612a2b
Merge pull request #2470 from metalivedev/2369-docuncompress
...
Documenting decompression behavior.
Upstream-commit: c1c65f972a0db81be9415c330493e7d76d3a6501
Component: engine
2013-10-30 19:14:51 -07:00
a162db7be1
Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
...
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
68c3dce6e6
Merge pull request #2299 from tmc/master
...
Client: Add -notrunc and -q flags to docker history
RemoteAPI: Add size to history
Upstream-commit: 4dfa28fb95edbd92fc93005040a51fbf923720c2
Component: engine
2013-10-30 18:52:18 -07:00
4eb97d1f45
Assign id as name when all else fails
...
Upstream-commit: 8227ea35cfc6a8e7e3da7baed5bfa8a62e304df5
Component: engine
2013-10-30 18:31:18 -07:00
67b88fd430
Add flags to history, add size flag
...
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
67465c23f0
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.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
fe428bd3cd
Support copying value from env with -e option.
...
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
2013-10-31 01:19:09 +01:00
ddf4ad8def
Fix #2369 by documenting decompression behavior.
...
Upstream-commit: 26f4d6bf59bee7cd4290ea4e31a19da087a180f2
Component: engine
2013-10-30 16:50:58 -07:00
303967e843
Set environment variables using a file.
...
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00
75ba650555
Merge pull request #2456 from dotcloud/update_release_checklist.md
...
Update RELEASE-CHECKLIST.md to reflect new changes
Upstream-commit: 5eb472025ad37539e86305cec9b139f77ce8dff8
Component: engine
2013-10-30 16:38:09 -07:00
ce829b0604
Merge pull request #2274 from peterbraden/2137-docs
...
Re #2137 Note about vagrant dns in the test documentation
Upstream-commit: bdd12bb7037d3e34cf294adafc6cabaf12f7cc77
Component: engine
2013-10-30 16:32:35 -07:00
0b4da3c51a
Merge branch 'release' back to master
...
Upstream-commit: ef00317a70dbc7b7cec8b475ffc36a9b7a525c78
Component: engine
2013-10-30 16:09:02 -07:00
447c686434
set containers comm to true by default
...
Upstream-commit: 3ff845904daabc47ed8f40b2edf3711b364ef206
Component: engine
2013-10-30 15:06:28 -07:00
6a3c2e6dc1
fix warning in build
...
Upstream-commit: ec488fa1231a9a5240dc0cd38c99ca3241fcaf7c
Component: engine
2013-10-30 15:06:01 -07:00
2e2c6bb437
Merge pull request #2469 from dotcloud/hotfix_release2
...
Hotfix changes for default values in 0.6.5
Upstream-commit: d7fac67e0a2c7fe2138e2d5dea99bd169bde3ce9
Component: engine
2013-10-30 15:04:38 -07:00
a8a9a4c44f
set containers comm to true by default
...
Upstream-commit: f7c40a87f3b20f00b073652fc7b4e97a4035ae92
Component: engine
2013-10-30 14:48:19 -07:00
1f4eb6c975
fix warning in build
...
Upstream-commit: ee814055673ca1d5981a4e9e4788a4199fd2f456
Component: engine
2013-10-30 14:36:38 -07:00
eabed93c17
Merge pull request #2467 from dotcloud/release_hotfix
...
0.6.5 hotfixes
Upstream-commit: 23b3747945f49cdb41645fbf8442a2bdd30b7a77
Component: engine
2013-10-30 13:21:20 -07:00
d6b078e758
fix typos
...
Upstream-commit: 1c7ca51f3246baca6be75705ed932d26e20589e2
Component: engine
2013-10-30 13:18:48 -07:00
1eaec62c11
Update links and host integration documentation
...
Upstream-commit: 1edde0e8a38bfb50fc5d2ccc76a4659422a856c4
Component: engine
2013-10-30 13:11:02 -07:00
9468193dec
fix typos
...
Upstream-commit: 596facd1240036c91dd9579991aeb89f9f81f6eb
Component: engine
2013-10-30 13:06:47 -07:00
48339fee87
fix remove root name and fix error messages
...
Upstream-commit: 4fd389eee5675479e9f3414d79ac38f1ebcd0428
Component: engine
2013-10-30 13:06:43 -07:00
eabb6b91bc
improve error message
...
Upstream-commit: 6a9fb81c5794166fc62e8fc5c638127d69f13eee
Component: engine
2013-10-30 13:06:39 -07:00
da9e3155ba
continue build on expose with :, but displays a warning
...
Upstream-commit: 5fb6d6e47c41d7ca3eda71ef6fd9dab824b1daa1
Component: engine
2013-10-30 13:06:34 -07:00
4c6143c7d7
Update links and host integration documentation
...
Upstream-commit: a4d97a4e80d569181835b7d55348dc755f48ce25
Component: engine
2013-10-30 11:59:05 -07:00
72b9b76c5a
fix remove root name and fix error messages
...
Upstream-commit: 3362aaa4df4f1aaf4832514119f0ea25b11f1a57
Component: engine
2013-10-30 11:45:11 -07:00
0837dc21f1
improve error message
...
Upstream-commit: 8fa6e2b103e436435ad0f0ae00e8cc9af4c58ad4
Component: engine
2013-10-30 11:24:50 -07:00
d2b1922a6b
continue build on expose with :, but displays a warning
...
Upstream-commit: b2503a72f1f1db887fd11199036f05efe3d35992
Component: engine
2013-10-30 11:13:10 -07:00
483b6b0637
Merge pull request #2466 from dotcloud/hot-fix-restart-public-mappings
...
Hotfix: Migrate public mappings after upgrade
Upstream-commit: bb662bc12cd7994cb7d23e49d6d2b6130613dda6
Component: engine
2013-10-30 09:35:56 -07:00
cae555c9ca
Hotfix: Migrate public mappings after upgrade
...
Upstream-commit: 79bf2c2b0e898fdc93db66ddc1622bb79c0b83f8
Component: engine
2013-10-30 09:02:23 -07:00
15ee14c05a
Hotfix: Migrate public mappings after upgrade
...
Upstream-commit: 746ba127bfb3556d378ccd8b2c725b490d090334
Component: engine
2013-10-30 08:15:12 -07:00
85374b0f04
update RELEASE-CHECKLIST.md to reflect new changes
...
Upstream-commit: 9420e8def7023b5247858518e43bd7ab4f2b5e48
Component: engine
2013-10-29 15:34:33 -07:00
e20477be1c
Merge pull request #2428 from dotcloud/bump_0.6.5
...
Bump to version 0.6.5
Upstream-commit: 4f6ce1ba9e304462354d29483b95bdef3f647b52
Component: engine
2013-10-29 14:56:54 -07:00
74f186e682
Merge pull request #2453 from dotcloud/remove_logs_from_tests
...
Testing: remove some logs from tests
Upstream-commit: 2a9c18af525863703f9f55e8bd4a52455791b97b
Component: engine
2013-10-29 14:43:37 -07:00
81ae14e1e4
remove some logs from tests
...
Upstream-commit: 86970d00bbb9c5e3184fe4e3e7442fd0865c80ec
Component: engine
2013-10-29 14:42:34 -07:00
2a5d2430af
Bump to version 0.6.5
...
Upstream-commit: da054148dc17c869c6b7958d48d3abc9fe1cdcf9
Component: engine
2013-10-29 14:42:20 -07:00
5062e93d35
Merge branch 'master' into bump_0.6.5
...
Upstream-commit: 0174951195b6d02e226cb709040d3b3beb2312fd
Component: engine
2013-10-29 14:41:47 -07:00
3d88facaa2
Merge pull request #2426 from dotcloud/enable_sigproxy_default
...
Enable sig-proxy by default in run and attach
Upstream-commit: caa7cf14c009d8a8341423c981801512a74b9204
Component: engine
2013-10-29 14:39:17 -07:00
a59c312632
stop proxy at one point
...
Upstream-commit: 700a71e6b62a3786d11719ae30cacd0f90930525
Component: engine
2013-10-29 14:29:01 -07:00
82ec27b71b
Merge pull request #2429 from SvenDowideit/add-more-doc-pointers
...
tell potential doc updaters and contributors more details
Upstream-commit: 02e0fdee5788c6fe51136d991f8d6af3f8491ea4
Component: engine
2013-10-29 14:07:12 -07:00
9ea897f40d
Merge pull request #2443 from tlunter/fix_remote_api_doc
...
Container commit doesn't use a query parameter, uses POST body
Upstream-commit: baf23d3c3e91eaa721e817e236b2f25f17d6786a
Component: engine
2013-10-29 14:04:22 -07:00
5396145023
Merge pull request #2449 from tianon/remove-stackbrew-remnants
...
Remove old remnants of stackbrew now that it's a separate project
Upstream-commit: 5b75aea704e2c89285eaccf6e9f080c5c6dae7a1
Component: engine
2013-10-29 14:00:33 -07:00
d5914d940b
Merge pull request #2448 from keeb/fix-dsfg-readme
...
Fix export clause in readme
Upstream-commit: d91e1453320dd8ff37f133b530e372c5b9bc1ec9
Component: engine
2013-10-29 13:44:03 -07:00
1d9a962b55
Merge pull request #2451 from tianon/clarify-go-requirement
...
Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
Upstream-commit: 1384db5e7f756b759406b0a060129b6766c5ba2c
Component: engine
2013-10-29 13:41:01 -07:00
0c26d0cb6e
Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
...
Upstream-commit: ff147707b2382cc3d9f09fc09b306d4c50a39dfd
Component: engine
2013-10-29 13:41:26 -06:00
