02ebda558b
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
Upstream-commit: 2e4ee72201bf7c853266e0c7959fb9f080eccfc2
Component: engine
2013-10-18 11:31:13 -07:00
d53bf7553c
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
2013-10-18 07:29:07 +00:00
21aae43f3a
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
54f8255e5f
Merge pull request #2283 from tmc/master
...
Make mkimage-arch.sh a little more clear
Upstream-commit: 89a2c8e2cd2ddfe6f7874a1c7f063fdda208c580
Component: engine
2013-10-17 23:05:01 -07:00
b7d138e4ad
Use heredoc to make expect script more clear
...
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05:00
c53c4a96f0
Hack: fix tests which didn't cleanup properly
...
Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e
Component: engine
2013-10-18 02:13:36 +00:00
06ac81c4b1
Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
...
Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3
Component: engine
2013-10-18 02:13:36 +00:00
efb1162110
Merge pull request #2253 from jpetazzo/infrastructure-docs
...
Try a different presentation of infrastructure documentation.
Upstream-commit: 95ccb78aa79bb1d8704fe65b09803167b36cd074
Component: engine
2013-10-17 16:17:32 -07:00
427dad8458
Add Stackbrew.
...
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
2013-10-17 14:11:10 -07:00
fe7c7ab666
Update CHANGELOG.md
...
Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47
Component: engine
2013-10-17 11:26:17 -07:00
b4cacdf100
Merge branch 'release'
...
Upstream-commit: 414795856a623991927c14da14bfd49ef470c731
Component: engine
2013-10-16 18:20:04 -07:00
33479248a5
Merge pull request #2255 from dotcloud/bump_0.6.4
...
Bump to 0.6.4
Upstream-commit: 2f74b1c84bb892641643faf05615a80d555ad066
Component: engine
2013-10-16 17:59:45 -07:00
2ce8125dd1
Bump version to 0.6.4
...
Upstream-commit: e8da76605f11c10d964c251a944ca5cbcdf1518a
Component: engine
2013-10-16 17:50:08 -07:00
8f90ec3513
Merge branch 'master' into bump_0.6.4
...
Upstream-commit: f16e60665bbd62964a0bd216c4d118a28477a3c3
Component: engine
2013-10-16 17:48:17 -07:00
ff708a52c9
Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe
...
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe
Upstream-commit: 3ba989378692e90d3f06ab087b814fcf1a8eacd9
Component: engine
2013-10-16 17:27:23 -07:00
04a26ac7f0
Try a different presentation of infrastructure documentation.
...
Upstream-commit: 7b1c6ccabd1c1276c80abc1e818b45804a5d05ed
Component: engine
2013-10-16 17:11:21 -07:00
e2b23f2153
Merge pull request #2256 from dotcloud/discard_errno_0_errors
...
- Runtime: discard errno = 0 errors
Upstream-commit: 6ee2964a4ff1a6acd6023ff17ece3482ad4848be
Component: engine
2013-10-16 16:22:03 -07:00
8150e959e4
discard errno = 0 errors
...
Upstream-commit: 49c62879b8e3df0f0126b8ad844509bb79e016e5
Component: engine
2013-10-16 23:05:50 +00:00
4e221a5f03
Merge pull request #2246 from dotcloud/clean_when_start_fail
...
Add cleanup when container.Start fails
Upstream-commit: 34745ee0f4d487fd1eb6c6e1cdac1672deb26658
Component: engine
2013-10-16 15:06:08 -07:00
9d55c0e3cd
Merge pull request #2251 from dotcloud/skip_autoremove_test
...
skip auto-remove test for now
Upstream-commit: d21bd5b96493220ed61a62fa9366055a81f41721
Component: engine
2013-10-16 14:59:08 -07:00
e2c3019026
Merge pull request #2249 from jpetazzo/cleanup-errclosing-in-proxy
...
Catch errClosing error when TCP and UDP proxies are terminated.
Upstream-commit: 82220ea2add4bc829ea47e63f0d4724a2a59b808
Component: engine
2013-10-16 14:51:43 -07:00
9ca3eddef5
skip auto-remove test for now
...
Upstream-commit: 655b16c712f1112949ab0f694a12c4b3c7924498
Component: engine
2013-10-16 21:47:20 +00:00
0b9a8910b7
Merge pull request #2250 from dotcloud/revert-07-doc-changes
...
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client...
Upstream-commit: eb2d0d4bf5e7ac43e790784ee81fadfed18b99fc
Component: engine
2013-10-16 14:44:53 -07:00
d7c383fbe1
Catch errClosing error when TCP and UDP proxies are terminated.
...
Upstream-commit: cc851dbb3f4725562729f12663e246690a61c620
Component: engine
2013-10-16 14:43:20 -07:00
b5387a5b52
fix panic
...
Upstream-commit: e40fd1e3e10198b9e2291b3383ed041743a73878
Component: engine
2013-10-16 21:39:03 +00:00
2c8dcaacd9
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
...
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630.
Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a
Component: engine
2013-10-16 14:38:24 -07:00
27d84cc681
Merge pull request #2195 from mzdaniel/report
...
Add aggregated docker-ci email report
Upstream-commit: 7df8ec2093729b460c88656cb8d3fa6118f0dc58
Component: engine
2013-10-16 14:29:24 -07:00
5f90a0b230
testing infrastructure, PR #2195 : Add aggregated docker-ci email report
...
Upstream-commit: a2ffa637ceb694b1e7a21972a9482a0c9c1676c8
Component: engine
2013-10-16 13:30:15 -07:00
cb827ceba2
Refactor container.Start()
...
Upstream-commit: ed6ca109bf27fb2f1855332c47b7375fe4eaa8aa
Component: engine
2013-10-16 13:12:56 -07:00
aa1116ff4c
Merge pull request #2247 from dotcloud/improve_tests_error_messages
...
Tests: Remove a few errors
Upstream-commit: 6e48b739557d7a474fbdb867cd795717c221b248
Component: engine
2013-10-16 12:50:15 -07:00
adb94a43dc
Add clean if start fail
...
Upstream-commit: 664acd29718ba367cdbad17ec7ee83d1fe01b7e4
Component: engine
2013-10-16 19:48:24 +00:00
9ff0513e0d
change an errorf to a debugf
...
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
609dfc2138
remove false alarm error
...
Upstream-commit: 0e64a4d7e7d5dd7c68ecc1df9fe8234938f12026
Component: engine
2013-10-16 19:38:12 +00:00
410e5fb77b
api.go:108 Error parsing media type: error: mime: no media type
...
fix
Upstream-commit: 104a86936ab2611d6e8e54f5ef686f2e9d231bcf
Component: engine
2013-10-16 19:32:03 +00:00
593a4ad4b2
use httpError in a separate test
...
Upstream-commit: df697b4318f533556a2e9351d5995b2d1991ae5a
Component: engine
2013-10-16 19:23:47 +00:00
5169a82f2f
Merge pull request #2219 from tianon/completion
...
Reorganize contributed completion scripts to add zsh completion
Upstream-commit: 27fc01271ec3b9f86da415c024d96d79bc23e2fd
Component: engine
2013-10-16 11:40:56 -07:00
b798342998
Merge pull request #2220 from tianon/vim
...
Add vim syntax highlighting for Dockerfiles from @honza
Upstream-commit: 97ab118fbb13c9a9c700a51d58e099f4df3bea05
Component: engine
2013-10-16 11:40:42 -07:00
cbeb5bbba7
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe conditions.
...
Upstream-commit: fc659b68e4cd4f1a07a9fe37be4ebcb8e030a652
Component: engine
2013-10-16 11:35:45 -07:00
6ef1db724f
Merge pull request #2243 from jpetazzo/comments-stdcopy
...
Add better comments to utils/stdcopy.go.
Upstream-commit: 99f6b43f4f757ad177dac2c8139520d7d51b4d99
Component: engine
2013-10-16 11:17:15 -07:00
529ef5824f
Merge pull request #2244 from dotcloud/add_cleanup_leftover_container_tests
...
Tests: add cleanup to remove leftover containers
Upstream-commit: 2b92aa71f9f25a3e7d9d4bb0081d26e72af7a5f1
Component: engine
2013-10-16 11:09:48 -07:00
c27a5b0233
add cleanupin tests to remove leftover containers
...
Upstream-commit: f854529ae8c9e0139e9ca0466c597b133e3bf41e
Component: engine
2013-10-16 18:06:37 +00:00
261563ed6c
Add better comments to utils/stdcopy.go.
...
Upstream-commit: e32debcf5fb6bf056a871930a8a88d545653e96f
Component: engine
2013-10-16 10:58:53 -07:00
e0f9b734b2
Merge pull request #2236 from SvenDowideit/2209-comments-doc
...
#2209 - add the example @tianon gave to elaborate on the Comment docume...
Upstream-commit: 0e08e1d6959718cca86994b73686811e7d3ba158
Component: engine
2013-10-16 10:51:15 -07:00
7d69f30bb3
Merge pull request #2231 from metalivedev/1919-docreleaseinfo
...
Fix #1919 document how to edit and release docs.
Upstream-commit: 65b62307c35bfe58ee345de622c1779a01f2d178
Component: engine
2013-10-16 10:45:01 -07:00
64a054faa9
Merge pull request #2090 from kencochrane/master
...
added initial draft of the Docker infrastructure doc
Upstream-commit: 03e5d94b123a47626fc440fe681981fd03b94cb4
Component: engine
2013-10-16 10:44:22 -07:00
6de222a908
Merge pull request #2233 from tmc/master
...
Add mkimage-arch.sh
Upstream-commit: 0ca533ca356872b29586e4f59b443c667709d7e8
Component: engine
2013-10-15 19:27:45 -07:00
c5210160da
Add mkimage-arch.sh
...
Upstream-commit: d94a027da6fc75e856b31246de0b4a49206e942b
Component: engine
2013-10-16 02:26:15 +00:00
689165f239
#2209 - add the example @tianon gave to elaborate on the Comment documentation
...
Upstream-commit: 7250f9487463ae50d73865a4d02caec611e613ad
Component: engine
2013-10-16 11:12:47 +10:00
bedabb5a87
Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix
...
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
2013-10-15 17:40:48 -07:00
f5ea2a9958
Merge pull request #2235 from dotcloud/update_dockerfile
...
Update Dockerfile test comment
Upstream-commit: adb48ef319e0b15fde3376c96ff69a304836d24d
Component: engine
2013-10-15 17:32:48 -07:00
