Victor Vieux
eaeaf0d8e3
Merge pull request #10064 from hqhq/hq_fix_flag_comments
...
correct the flag comments
2015-01-13 11:06:24 -08:00
Jessie Frazelle
ab86f591c3
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
...
Add ProxyFromEnvironment enables client via proxy.
2015-01-13 10:53:00 -08:00
Jessie Frazelle
21cf4b4c4c
Merge pull request #9764 from ztombol/fix-reduce-arch-rootfs-size
...
Revisiting mkimage-arch.sh
2015-01-13 10:39:45 -08:00
Jessie Frazelle
b9e42d66e7
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
2015-01-13 10:37:29 -08:00
Alexander Morozov
9621e59909
Merge pull request #10013 from icecrime/9979_oom_exit_code
...
Fix error code when exiting on OOM
2015-01-13 10:33:21 -08:00
Simon Thulbourn
a70e8462cb
adds support for AWS IAM roles
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com >
2015-01-13 18:16:43 +00:00
Aanand Prasad
72095f54b2
Merge pull request #639 from albers/bash-completion
...
Bash completion for fig command
2015-01-13 17:46:42 +00:00
Evan Hazlett
d0c18b6c52
Merge pull request #270 from ehazlett/allow-diff-test-interval
...
allow for arbitrary test interval
2015-01-13 12:17:14 -05:00
Evan Hazlett
a0b3aab8b2
allow for arbitrary test interval
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-13 12:16:37 -05:00
Zoltan Tombol
18c0b41564
Delete man pages of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
2015-01-13 18:10:50 +01:00
Zoltan Tombol
9f59b057be
Revise list of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
2015-01-13 18:10:50 +01:00
Evan Hazlett
241a003315
Merge pull request #269 from ehazlett/integration-test-updates
...
integration test updates
2015-01-13 10:01:52 -05:00
Evan Hazlett
3c55011995
wip: integration test updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-13 10:00:06 -05:00
Jessie Frazelle
6e5c5d33dd
Merge pull request #10008 from rhatdan/help
...
Fix docker run/create not printing error messages
2015-01-13 06:48:33 -08:00
Dan Walsh
12a7e78b12
Fix docker run/exec/create not printing error messages
...
If an error message happens while parsing docker run or docker exec, the message
is not being printed out.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-01-13 09:23:13 -05:00
Andrea Luzzardi
336c1e265e
Merge pull request #237 from vieux/use_tcp_doc
...
use tcp:// in doc and update copyrights
2015-01-13 14:04:12 +01:00
Qiang Huang
00bd7b4c41
correct the flag comments
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-01-13 15:40:24 +08:00
Arnaud Porterie
9a9339d9a2
Test case for error code when exiting on OOM
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-01-12 23:16:28 -08:00
Daniel Nephin
26f45efea2
Remove unused intermediate_container from return value.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-01-12 22:16:54 -08:00
HuKeping
e721ed9b53
restart: Fix the compare of restart policy
...
Since the failure count of container will increase by 1 every time it
exits successfully, the compare in function shouldRestart() will stop
container to restart by the last time.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-01-13 13:05:30 +08:00
Michael Crosby
9f2c486144
Merge pull request #10055 from icecrime/upgrade_libcontainer
...
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
2015-01-12 20:44:25 -08:00
Tianon Gravi
5d59fdcd38
Merge pull request #10057 from tianon/fix-tgz
...
Fix tgz for Windows binaries
2015-01-12 20:28:04 -07:00
Srini Brahmaroutu
21a809d9ae
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-01-13 03:27:17 +00:00
Tianon Gravi
71b03d8aeb
Fix tgz for Windows binaries
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-01-12 19:56:53 -07:00
Arnaud Porterie
009041cdfd
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
...
Correct exit code when dying on a signal (fixes #9979 ).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-01-12 18:12:59 -08:00
Lei Jitang
400d92871c
Add --link accept container ID
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-01-13 09:38:12 +08:00
Jessie Frazelle
9b0072a7e6
Merge pull request #10029 from soulshake/add-cecilia-payne-gaposchkin
...
Add Cecilia Payne-Gaposchkin to names generator.
2015-01-12 17:31:19 -08:00
Victor Vieux
1e678662a2
Merge pull request #238 from mota/syntax-cleanup
...
Syntax cleanup
2015-01-12 17:17:03 -08:00
Pierre Wacrenier
4cd7a4e8e3
More canonical Container creation in inspectContainer
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
2015-01-13 02:12:16 +01:00
Pierre Wacrenier
044b332759
createRouter doesn't yield errors
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
2015-01-13 02:02:01 +01:00
Pierre Wacrenier
f7735d629b
More canonical Event construction on node event handling
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
2015-01-13 01:57:29 +01:00
AJ Bowen
41178adb7e
Add Cecilia Payne-Gaposchkin to the names generator.
...
Signed-off-by: AJ Bowen <aj@gandi.net >
2015-01-12 16:24:15 -08:00
Jessie Frazelle
0da9540eda
Merge pull request #10054 from shin-/docker-py-bump-0.7.1
...
Bumped docker-py version to latest release
2015-01-12 15:27:44 -08:00
Alexander Morozov
6ef475bada
Merge pull request #10053 from vieux/update_copyrights
...
update copyrights to 2015
2015-01-12 15:07:59 -08:00
Joffrey F
3873b19c31
Bumped docker-py version to latest release
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-01-12 15:01:09 -08:00
Victor Vieux
a638b360ae
use tcp:// in doc and update copyrights
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-12 22:58:03 +00:00
Victor Vieux
b70632ec53
fix issue with goimport
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-12 22:52:19 +00:00
Victor Vieux
e5869b2b0b
update copyrights to 2015
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-12 22:47:36 +00:00
Victor Vieux
a24e29de3f
fix test zk
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-12 22:28:59 +00:00
Victor Vieux
030c715007
Merge pull request #231 from chanwit/cleanup-zookeeper
...
Cleanup: zookeeper discovery's watcher
2015-01-12 14:20:34 -08:00
Victor Vieux
3cc61b728f
improve addr validation
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-12 22:18:59 +00:00
Stephen J Day
01bc08351d
Ignore Godeps for gofmt and golint
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-01-12 14:01:13 -08:00
Stephen J Day
fc2a840e8f
Use Godep to vendor distribution dependencies
...
As we get closer to release, we need to ensure that builds are repeatable.
Godep provides a workable solution to managing dependencies in Go to support
this requirement. This commit should be bolstered by updates to documentation
and build configuration.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-01-12 14:01:04 -08:00
Stephen Day
972a95f077
Merge pull request #58 from BrianBland/s3-enable
...
Enables s3 driver
2015-01-12 13:41:35 -08:00
Brian Bland
16a258ce69
Enables s3 driver, limits permission check to scope of rootdirectory
...
Signed-off-by: Brian Bland <brian.bland@docker.com >
2015-01-12 13:34:49 -08:00
Michael Crosby
43a75f5b93
Merge pull request #9962 from andi5/fix-doc-cmdline-port
...
Fix order of pause and port in command line documentation.
2015-01-12 13:22:51 -08:00
Michael Crosby
4e0f656d74
Merge pull request #10051 from thaJeztah/fix-error-message
...
Fix typo in error-message.
2015-01-12 13:12:10 -08:00
Stephen Day
df4441d03c
Merge pull request #18 from AndreyKostov/ng-add-s3driver-features
...
Add features to the s3 driver
2015-01-12 13:10:33 -08:00
Michael Crosby
9215c3901e
Merge pull request #10019 from jfrazelle/9954-text-plain-content-type
...
Use "text/plain" content-type
2015-01-12 12:50:35 -08:00
Sebastiaan van Stijn
5f699a465d
Fix typo in error-message.
...
This fixes a small typo in the errormessage for memory-swap.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-01-12 21:48:44 +01:00