a0f64049ec
Merge branch 'master' into fix_tests
...
Upstream-commit: bb284ce59d661d9ec6e8dc9fd5b8fe21b588484b
Component: engine
2013-11-29 13:17:36 -08:00
ccfe71909e
Reduce the timeout for restart/stop
...
Upstream-commit: 34353e782e1cdbd6aae078b3e660875e703d35ff
Component: engine
2013-11-29 11:08:01 -08:00
2135aa6aca
Fix behavior of tty tests
...
Upstream-commit: 86c00be180f1e6831ca426576a55f5106f156448
Component: engine
2013-11-29 10:17:25 -08:00
90e04ec65d
Remove an unit test from integrations test
...
Upstream-commit: 2ec1146679598837cd8bab62dc672bcda2a9610c
Component: engine
2013-11-29 10:17:04 -08:00
30abdabd65
Fix TestAttachDetachTruncatedID (behavior + tty issue)
...
Upstream-commit: 2e6a958612d65a0665a9396372fe82706987d085
Component: engine
2013-11-29 10:03:36 -08:00
e107dad484
Create helper function for tests
...
Upstream-commit: 697be6aaa009cd2bea5f07ae0b0780703e6565e1
Component: engine
2013-11-29 10:02:22 -08:00
27de84e1e0
Make sure the termcaps are restored after hijack
...
Upstream-commit: c13821ad0bfa596a8bbc06a494500ee39a35e429
Component: engine
2013-11-29 09:55:15 -08:00
caf6f256a4
Fix term.RestoreTerminal behavior
...
Upstream-commit: aa68656cd3aefe2a64dc259e8d19c72010e4f85b
Component: engine
2013-11-29 09:52:44 -08:00
4a151bb6e6
Actually test the detach (was not the case before)
...
Upstream-commit: 63d6cbe3e4d6f29c2491b0f1f505ef79b7191d8e
Component: engine
2013-11-29 09:11:20 -08:00
eab6c90e20
Make the PTY in raw mode before assert test (TestAttachDetach)
...
Upstream-commit: 67e9e0e11bb932ef9113ac91b2c1b0af6ee4db6d
Component: engine
2013-11-29 08:29:56 -08:00
fb39460944
Add a GetPtyMaster() method to container to retrieve the pty from an other package.
...
We could also have put ptyMaster public, but then we need to ignore it in json
otherwise the Marshalling fails. I think it is cleaner that way.
Upstream-commit: fbebe20bc69648c046e3818ca744ae246092a782
Component: engine
2013-11-29 07:40:44 -08:00
9f9072c9ad
Make sure the container is running before testing against it (TestAttachDetach)
...
Upstream-commit: e535f544c7bc9c32b23e5505110a5513ff36be5a
Component: engine
2013-11-29 07:39:51 -08:00
34e8bb0db2
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
Upstream-commit: 926f7b579e48dcd5bda26bcd7a0ef0e25aed94da
Component: engine
2013-11-28 17:55:11 -08:00
43b168be86
Merge pull request #2357 from ulyssecarion/master
...
Document setting up Vagrant-docker with the remote API
Upstream-commit: ff5747728c6a0bde71108c86b20b0880c2d3d6e4
Component: engine
2013-11-28 17:54:05 -08:00
4a247aee4e
Merge pull request #2901 from dkumor/patch-1
...
Deleted references to AUFS in Arch docs
Upstream-commit: 6c5699363954d145bd51c6069db587b1aceece8a
Component: engine
2013-11-28 17:39:26 -08:00
b5bdf9e788
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
Upstream-commit: 139644895e39fd452d0aa7b2835f4bdd0f2ec461
Component: engine
2013-11-28 17:16:25 -08:00
bc039de754
Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
...
Stop invalid calls to Registry
Upstream-commit: cca9e51f5d9747dc03830f0c255543a0c9137cc3
Component: engine
2013-11-28 17:00:22 -08:00
1c0208b60e
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
Upstream-commit: 668d22be5485e3f25f836788d62683828cd621fe
Component: engine
2013-11-28 16:58:31 -08:00
04d46060bc
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
...
Upstream-commit: 77c94175bdc387e7f43876f7097b970f67116054
Component: engine
2013-11-28 16:57:51 -08:00
3fa08922b3
Merge pull request #2923 from creack/refactor_cgo_in_go
...
Refactor attach loop device in pure Go
Upstream-commit: f94ea7769fd3e47c5914eb2fdad62c9d2162c339
Component: engine
2013-11-28 16:52:38 -08:00
49a166224c
Merge pull request #2844 from tianon/fix-mount-spaces
...
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
Upstream-commit: 39bec226c0cfb76ab3486129a6e02b1572653051
Component: engine
2013-11-28 16:48:36 -08:00
a63f83c19a
Merge pull request #2881 from yrashk/patch-1
...
Fix command line help for docker save
Upstream-commit: 677e2ad92ef526918e5054b5afe1fbd858219fa3
Component: engine
2013-11-28 16:42:40 -08:00
014494a3f4
Make race condition more obvious by performing more asserts
...
Upstream-commit: ad43d88af5bda8dc5b3d06f64de380bb985191ba
Component: engine
2013-11-28 16:12:45 -08:00
108a9c911c
Merge pull request #2818 from pnasrat/docker-pprof
...
Wire in pprof handlers.
Upstream-commit: 3faf450f11d92a6cbcf498ee85b57f4743612aac
Component: engine
2013-11-28 14:43:13 -08:00
7a655fcbd8
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
Upstream-commit: a0525d90abd7ab3c95ae90302ffcc8c69fe6f429
Component: engine
2013-11-28 14:35:17 -08:00
f98721fac4
Merge pull request #2922 from ath0mas/patch-1
...
Restore 'save' paragraph
Upstream-commit: 14425c1690d56f8c472f93a1d01bfd40cd3a4f78
Component: engine
2013-11-28 14:15:43 -08:00
6805e23c72
Merge pull request #2888 from tianon/changelog-fix
...
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
Upstream-commit: aae23255a0ce02d96dd58267e3adf503aabeb458
Component: engine
2013-11-28 12:24:56 -08:00
908bc35224
Improve devmapper unit tests with syscall/ioctl
...
Upstream-commit: 261bd0d187cbc8f650d77e5c93872332c290b164
Component: engine
2013-11-28 11:53:09 -08:00
391598f889
Merge pull request #2892 from creack/add_cli_test-1
...
Add ParseRun unit tests
Upstream-commit: 3d0486979e32c503625dbe96de625f7ebd29e2d6
Component: engine
2013-11-28 11:39:48 -08:00
9eafea47b6
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
Upstream-commit: 377817db1b2fadf9c4294d8356aa7c75eb12e83a
Component: engine
2013-11-28 11:20:43 -08:00
a718116c6b
Correct comments
...
Upstream-commit: a990b3aeb9640d35e73f99030e03e58e71924ed5
Component: engine
2013-11-28 11:02:53 -08:00
798ad27de8
Wire in pprof handlers.
...
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
Upstream-commit: 9f46779d42c9b90a70c3c434d03a4502070e1b6d
Component: engine
2013-11-28 13:46:58 -05:00
799ccd9aee
Rename file for consistency
...
Upstream-commit: 533067bba47acec0f65dc7e499944b9402bafb04
Component: engine
2013-11-28 10:37:03 -08:00
752dcb1a87
Stop invalid calls to Registry
...
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
Upstream-commit: d47507791e14908e78cf38d415a9863c9ef75c5e
Component: engine
2013-11-28 16:43:28 +00:00
4b1fc75599
Remove explanation of removed argument
...
Upstream-commit: f1e44e0b0c6eff011c596008c75f7fdff09dbf5e
Component: engine
2013-11-28 09:55:15 -05:00
a109c2d18a
Document setting up Vagrant-docker with the remote API
...
Upstream-commit: c226ab6d9edb6b74547348c309c633f207bd4aa4
Component: engine
2013-11-27 20:05:54 -08:00
dedf4cec9b
Merge branch 'master' into refactor_cgo_in_go
...
Upstream-commit: a58fef9f134d5be5f3093502c0acf42f98a7d932
Component: engine
2013-11-27 18:55:11 -08:00
3f2a763338
Move syscall.Stats logic to os specific file.
...
related to #2909 .
Upstream-commit: 8b2a7e35c35f894dca0795a4fde9ec0cfe04ce43
Component: engine
2013-11-28 00:22:47 -02:00
db6404f914
Check if the target loopback is a block device
...
Upstream-commit: 8a5d927a5337b1c9a0c8478c4e522ce0ded09b85
Component: engine
2013-11-27 18:21:17 -08:00
6eb8ce2948
Extract ioctl from wrapper
...
Upstream-commit: 1214b8897bba2a33a7ded8779bcdc966fe1cb176
Component: engine
2013-11-27 17:47:20 -08:00
3ddb3cbb0d
Move attach loop device to its own file
...
Upstream-commit: eb528b959efc0a3924939991be45704047fd5aea
Component: engine
2013-11-27 17:12:57 -08:00
097c09d144
Refactor attach loop device in pure Go
...
Upstream-commit: 74c8f7af756ed03131aee051b0ccb926b77e04db
Component: engine
2013-11-27 15:39:30 -08:00
ac3797d133
Restore 'save' paragraph
...
Upstream-commit: 2c27da881807b6c63ef29e8033241a17c76f5ab7
Component: engine
2013-11-28 00:39:06 +01:00
804f3d1553
Merge pull request #2914 from crosbymichael/open-issues
...
Add instructions for opening issues on the repository
Upstream-commit: 39f21af6879bb69550084db4188985598beb3800
Component: engine
2013-11-27 15:25:12 -08:00
b9024bb8a7
Merge pull request #2831 from SvenDowideit/please-ignore-squiggle-backup-files
...
Please ignore squiggle backup files
Upstream-commit: 7f9cdaa342a724dca42d3882e07c294ea972361c
Component: engine
2013-11-27 11:04:21 -08:00
3abe5b8a85
Add instructions for opening issues on the repository
...
Upstream-commit: e4ae44b844a38327ee4288361376299595b1917e
Component: engine
2013-11-27 10:41:20 -08:00
3e874ec270
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
Upstream-commit: 89454851d12c73c2865799c3d192eeaf55746b87
Component: engine
2013-11-27 10:04:55 -08:00
92016b6859
Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message
...
there appears to be a slash prepended to a container name internally
Upstream-commit: f75dc36204b37d9cb292fd3cf949e1cec1142c36
Component: engine
2013-11-27 09:58:24 -08:00
d103214bb0
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
Upstream-commit: 4e826e99b278ef3cc438553e958727397b4d9ee7
Component: engine
2013-11-27 12:55:15 -05:00
a17dc473b7
Handle the case where poolAdd() gives an error for an unknown pool type
...
Upstream-commit: 788feab3a7de44a4749e5a861e3b6f778aa4088b
Component: engine
2013-11-27 16:53:36 +00:00
Guillaume J. Charmes
Victor Vieux
Thatcher
Solomon Hykes
Michael Crosby
Paul Nasrat
Danny Yates
John Warwick
Ulysse Carion
Andrews Medina
Alexis THOMAS
Guillaume J. Charmes
Danny Yates