d2f9375ffc
Swapped a map for a list in writeBroadcaster.
...
Upstream-commit: 75ba07cb3a7fcf5d6cc9f1120fd3468a9658be67
Component: engine
2013-03-30 16:04:19 +01:00
248356b56f
Make writeBroadcaster safe for concurrent use.
...
Upstream-commit: 0bdfcfaa33b4945fdfd6ff9ea82bf3c5aa63848d
Component: engine
2013-03-30 16:02:22 +01:00
7d7b9e2369
Merge remote-tracking branch 'robryk/cmdstream-deadlock'
...
Upstream-commit: d1ed28cb941578b07420a507886ddebaed78deb8
Component: engine
2013-03-29 23:43:02 -07:00
06b3a9272b
Merge remote-tracking branch 'origin/improve_container_tests'
...
Upstream-commit: 7dbb1eacc19d8393ad714866b3e3682bc23ca0dd
Component: engine
2013-03-29 23:41:09 -07:00
c03f7d98ac
Added a timeout to TestCmdStreamLargeStderr.
...
Upstream-commit: 68278b66c5294690d051d6a0fe157e2b965d7b1a
Component: engine
2013-03-29 22:36:36 +01:00
c6d73bb803
Merge remote-tracking branch 'robryk/bufreader-race'
...
Upstream-commit: f483b214bb3e1f2586e5caca61e3c8384f0ad2e4
Component: engine
2013-03-29 13:50:33 -07:00
b6985fe801
Merge pull request #250 from metachord/master
...
Remove unnecessary path parts
Upstream-commit: f5b458b1dc898862609ad5aadea7321cbec582c6
Component: engine
2013-03-29 13:42:23 -07:00
7e0d305381
FIXME: implement a timeout in TestCmdStreamLArgStderr to avoid blocking the whole test suite when it fails
...
Upstream-commit: f7b4f0c19329bcf13b0df5408e2bc9eac89e9f44
Component: engine
2013-03-29 13:37:52 -07:00
f890496d6d
Comment CmdStream a little bit to facilitate future fixes and contributions
...
Upstream-commit: 6ede6bc8f2c1cd465fd48120d42aa39853b51111
Component: engine
2013-03-29 13:26:02 -07:00
2fd3cec407
Merge remote-tracking branch 'robryk/cmdstream-deadlock'
...
Upstream-commit: fdae64d8d77dec092c8e5efc55c05057639b0170
Component: engine
2013-03-29 13:20:17 -07:00
b3fc1dd176
Comment to explain CmdStream
...
Upstream-commit: f85e6548c79648b8bcff8ee83142983bbb15dacb
Component: engine
2013-03-29 13:18:59 -07:00
e3924816a0
Merged Ctrl-C interception by @creack
...
Upstream-commit: c937e237ad0625fc0ae8049e745bf599c27b0af8
Component: engine
2013-03-29 13:12:04 -07:00
2944ce91cb
Add unit test for multiple attach / restart
...
Upstream-commit: 0ebdca5e6144b0176a4b161cb1bd40efc0dc7efe
Component: engine
2013-03-29 10:56:49 -07:00
002d37a1c9
Fix #108 , reattach now works properly
...
Upstream-commit: 0b2eee8b33448c27c4d2b29b995a56ce3a411963
Component: engine
2013-03-29 09:31:47 -07:00
3f6c2c9af6
Merge pull request #265 from dotcloud/formating_debug_harmonize
...
Formating debug harmonize
Upstream-commit: d0d5d5ff094a5c03a6b13a18394108cda126eef2
Component: engine
2013-03-29 21:30:43 -07:00
c78aa90b5a
Merge pull request #266 from dotcloud/do_not_log_stopped_container
...
Do not log non-running containers
Upstream-commit: 57dfca052b47ae6daf6d0c54e68907a025f9ec8e
Component: engine
2013-03-29 21:29:19 -07:00
38462f5f51
Add comments in graph.go
...
Upstream-commit: 99b36c2c326ccc11e726eee6ee78a0baf166ef96
Component: engine
2013-03-29 21:13:59 -07:00
6a1fd378c7
Merge remote-tracking branch 'origin/264-remove_cmdAttach_option'
...
Upstream-commit: b013d937869372a352387d3441f1c36428f958c3
Component: engine
2013-03-29 20:30:43 -07:00
57259fb9c3
Merge remote-tracking branch 'lopter/master'
...
Upstream-commit: b1fa21aa0ee9326ad6e3c0f32b80f5905995427a
Component: engine
2013-03-29 20:17:33 -07:00
69a838f359
Fix output in the login command
...
It was broken because the terminal is in raw mode.
This changeset adds code in the login commmand to do a little bit of
interpretation on the user input (something usually done by the terminal
emulator itself).
Upstream-commit: 9740102990b059d014fad5f8652306cf7ff62d94
Component: engine
2013-03-29 11:39:41 -07:00
0ccd58f712
Do not log non-running containers
...
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
38f2e38ea3
Remove unused variable from container struct
...
Upstream-commit: 7a565a0479b6a797a0cdc9a4156e57ce811032b3
Component: engine
2013-03-29 08:41:48 -07:00
a659bdb4eb
Add some error checking in container monitor
...
Upstream-commit: 69c2250ec2fd23dc9d31372cb433b7c18a917d09
Component: engine
2013-03-29 08:29:59 -07:00
2588801f2a
Harmonize the error management. Use fmt.Errorf instead of errors.New
...
Upstream-commit: d17f78c373d5d8cd015626c7972e0e2365eab2a7
Component: engine
2013-03-29 08:19:42 -07:00
f235c36167
Add debug infos
...
Upstream-commit: ccac5b138253ab87846089cb5af9b4b77a7fd9d5
Component: engine
2013-03-29 08:18:43 -07:00
c96ec675c0
Remove the options of CmdAttach
...
Upstream-commit: 9442d6b349295818d9a0ddecc10ca19019ead935
Component: engine
2013-03-29 07:49:26 -07:00
84436a6982
Improve the containers unit tests (add error checking)
...
Upstream-commit: 232dbb186416df290fc698e92b3a120b92497559
Component: engine
2013-03-29 07:44:58 -07:00
ddfd49ddce
Fix a deadlock in CmdStream.
...
As per FIXME, CmdStream could have deadlocked if a command printed
enough on stderr. This commit fixes that, but still keeps all of
the stderr output in memory.
Upstream-commit: 58befe3081726ef74ea09198cd9488fb42c51f51
Component: engine
2013-03-29 12:55:48 +01:00
2db6acd48b
Fix a race condition in bufReader.
...
The race condition cen be detected by running existing bufReader tests
with Go's race detector.
Upstream-commit: d52451bcf887790df5a6a7cbbc7305747535eb11
Component: engine
2013-03-29 11:00:50 +01:00
2c32113c8a
Remove unnecessary part of paths to lxc executables
...
Upstream-commit: 6d72758f1268f710be635cb16ef8e001fc6516a5
Component: engine
2013-03-29 12:07:25 +07:00
84af23bd19
Fixed leftover from docs merge. Thanks @cespare for spotting!
...
Upstream-commit: 1d6929c8bc6cbc5ad63dce083869460b6bb377ad
Component: engine
2013-03-28 19:18:03 -07:00
8ff79b2c0d
Merging dhrp/docs
...
Upstream-commit: 48a208baf197c035c59ecd44d285fb3640107233
Component: engine
2013-03-28 19:12:58 -07:00
1a47c25086
Fixed some links in gettingstarted
...
Upstream-commit: 61cf09b2e7491295575195b616207059e7107f01
Component: engine
2013-03-28 19:03:06 -07:00
ce39132944
Merge pull request #241 from titanous/cleanup-deps
...
Remove unneeded sqlite deps from puppet and debian control
Upstream-commit: b51fe837a4992437372e18f9660c87be9ee593a8
Component: engine
2013-03-28 18:45:44 -07:00
ea281519af
Merge pull request #244 from dotcloud/docs-julien
...
Docs: Changed the url of the LEGO img to point to the one with copyright
Upstream-commit: 4e11e425467f1aac77104cc983df160b45e3da41
Component: engine
2013-03-28 18:45:20 -07:00
7f80c9c88f
Test that iptables() looks for iptables in the PATH
...
Upstream-commit: ba33d67a1a0f3310bddab8176a9d570e5d5c00e2
Component: engine
2013-03-28 18:44:47 -07:00
5d8e5c0e3c
Merge remote-tracking branch 'shawnsi/iptables-wrapper'
...
Upstream-commit: 70853785b6f04337168343d8889eba413a40ce54
Component: engine
2013-03-28 18:40:02 -07:00
a2ceb7616d
Merge remote-tracking branch 'titanous/camelize'
...
Upstream-commit: 12a65dc4a884977454e7924db4a87166f751536a
Component: engine
2013-03-28 18:23:59 -07:00
c6d2fd3579
Update AUTHORS and add .mailmap
...
Upstream-commit: 6bcc55f7d030d0cfd7bf130070805a9001951b06
Component: engine
2013-03-28 20:53:54 -04:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
e2569478ab
Docs: Changed the url of the LEGO img to point to the one with copyright
...
Upstream-commit: d66de319bd1c66e04421c19e7fc25b825d94fe00
Component: engine
2013-03-28 17:09:36 -07:00
264201cac6
Merge remote-tracking branch 'origin/165-push_permission_check-fix'
...
Upstream-commit: 0636c11f0b15f8fa0693be2d3560370f19f773cf
Component: engine
2013-03-28 15:45:00 -07:00
4b29aba42a
Remove unneeded sqlite deps from puppet and debian control
...
Upstream-commit: 5dc1e66366d3a40169eec67d823f2d6209ba5b99
Component: engine
2013-03-28 18:38:53 -04:00
52aecd4a56
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docs/sources/examples/python_web_app.rst
Upstream-commit: 09910785c80822fad71127db4ec30b3de8c27f08
Component: engine
2013-03-28 12:48:32 -07:00
46acd15bd1
Handling iptables() errors more usefully during portmapper setup
...
Upstream-commit: 523803d633e3bf7e4076ad41e73daba491da5d40
Component: engine
2013-03-28 14:44:54 -05:00
de000293fa
Return error when iptables is not found
...
Upstream-commit: c66d2b6a532c657b554ffa3c80b2cf15e218ee8e
Component: engine
2013-03-28 14:30:56 -05:00
a587e006db
Added the lego illustration to the docs.docker.io 'homepage'
...
Upstream-commit: da69df5f421ed49464254fb52dc222f98587345f
Component: engine
2013-03-28 12:27:37 -07:00
b0c9bfcaf7
Changed the lego illustration on /README.md to the version which contains the copyright in the image itself.
...
Upstream-commit: 32b58159cd0eedc9d6cd05e8d78b8519c5b690c7
Component: engine
2013-03-28 12:18:22 -07:00
ef4aab72d7
Looking for iptables in PATH
...
Upstream-commit: dfc3904f778996a449ef5199e36fce6cabfb803a
Component: engine
2013-03-28 14:02:50 -05:00
7627c4db8d
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 4825d3a5374cb177642c72389d6048f34535d9c9
Component: engine
2013-03-28 11:54:33 -07:00
