David Calavera
f5d3311839
Merge pull request #13449 from duglin/FixRaceInStop
...
Fix race condition on container stop
2015-05-27 13:05:53 -07:00
Evan Hazlett
fec8b4aaab
Merge pull request #1252 from janeczku/docs-fix
...
docs: fix merge conflict in docs (replaces #1248 )
2015-05-27 16:03:11 -04:00
Stephen J Day
a2d4f51aa4
Notification should send digest URL in event target
...
Previously, the most accurate reference for a manifest was the tag url. After
adding pull by digest, all event notifications should refer directly to the
digest url. This ensures that event uniquely identifies the target of the
notification. Testing has been added for manifest pull events to check that
this doesn't change.
In addition, the listener interface has been refactored to only use the
repository name, rather than the full repository object.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-05-27 12:56:12 -07:00
Jessica Frazelle
af7d17a6c9
apply selinux labels volume patch on volumes refactor
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 12:50:16 -07:00
Dan Walsh
160dc79db0
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 12:50:16 -07:00
Jeffrey Morgan
112301b774
Merge pull request #551 from TeckniX/patch-1
...
Random port mapping and warnings
2015-05-27 12:47:06 -07:00
Sean Li
be09bfc247
Merge pull request #554 from kitematic/fix-filter-by-tab-hover
...
Fixed tab label hover.
2015-05-27 12:46:38 -07:00
Sean Li
9a6b082121
Fixed tab label hover.
2015-05-27 12:45:41 -07:00
Jan Broer
8cdf8e9561
Fixed corrupted docs
...
Signed-off-by: Jan Broer <janeczku@yahoo.de >
2015-05-27 21:03:59 +02:00
Andrea Luzzardi
84652ed537
Merge pull request #768 from jimmyxian/add-support-import
...
Add support import
2015-05-27 11:46:07 -07:00
Alexandre Beslic
23f66f8cc6
Merge pull request #858 from aluzzardi/addr-flag
...
Replace --addr with --advertise
2015-05-27 11:44:41 -07:00
Evan Hazlett
137b174993
updated changelog with latest
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-05-27 14:14:28 -04:00
TeckniX
d0b6749193
Removed old comment for dockerUtil restart
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-05-27 14:13:03 -04:00
Andrea Luzzardi
43f869156b
Merge pull request #862 from rajdeepd/test-affinity
...
Added a New use case for Conflicting Affinity
2015-05-27 11:09:29 -07:00
TeckniX
ee5ad39667
Patched warnings and random port assignment
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-05-27 13:58:06 -04:00
Evan Hazlett
be7c110dfd
Merge pull request #1247 from ehazlett/redhat-tty-fix
...
redhat: fix tty provision bug
2015-05-27 13:57:44 -04:00
Victor Vieux
2b5835a7cc
Merge pull request #860 from abronan/add_test_removal
...
pkg/store: Additional check in Node Removal integration test
2015-05-27 10:55:28 -07:00
Alexander Morozov
7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
David Calavera
26650e2ccc
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
2015-05-27 10:22:31 -07:00
Victor Vieux
ca3e9355db
Merge pull request #864 from abronan/zookeeper_cas
...
store: Zookeeper cas and consistent errors on failure
2015-05-27 10:15:36 -07:00
Alexandre Beslic
70729ae624
Merge pull request #863 from alexwlchan/master
...
Small spelling and capitalisation fixes
2015-05-27 10:06:23 -07:00
Aanand Prasad
686c25d50f
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-05-27 17:52:23 +01:00
Doug Davis
b29f3bb1c3
Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil
...
Return err if we got err on parseForm
2015-05-27 12:38:53 -04:00
Alexander Morozov
2029257e3c
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
2015-05-27 08:44:11 -07:00
Evan Hazlett
ae5aeb2a67
Merge pull request #1246 from alexwlchan/master
...
Fix spelling and capitalisation mistakes in docs
2015-05-27 11:44:01 -04:00
Evan Hazlett
512f403bb2
Merge pull request #1244 from frapposelli/vcloudair-fix-catalogitem
...
Fix for the default vCloud Air catalog item.
2015-05-27 11:42:18 -04:00
Aanand Prasad
7d9aa8e0a9
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-05-27 16:27:24 +01:00
Phil Estes
f3e56420a3
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
2015-05-27 11:10:36 -04:00
Alexandre Beslic
6a92628ddb
Add ErrKeyModified error to etcd and zookeeper
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-27 08:09:33 -07:00
Dan Walsh
66121d1b45
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-05-27 11:00:12 -04:00
Evan Hazlett
a66c229cda
Merge pull request #1178 from ehazlett/debian-provisioner
...
Debian Provisioner
2015-05-27 10:59:19 -04:00
Evan Hazlett
ec5edb0354
redhat: fix tty provision bug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-05-27 10:56:43 -04:00
TeckniX
dedf1d61a7
Modified docker cli to use proper shell
2015-05-27 10:50:50 -04:00
Evan Hazlett
d99a46ca04
Merge pull request #1217 from janeczku/logger-bugfix
...
logger: fix error logger writing to stdout instead of stderr
2015-05-27 10:28:54 -04:00
Alex Chan
917653254c
Small spelling and capitalisation fixes
...
Signed-off-by: Alex Chan <alex.chan@metaswitch.com >
2015-05-27 15:22:36 +01:00
alex.chan@metaswitch.com
566528547e
Fix spelling and capitalisation mistakes in docs
...
Signed-off-by: Alex Chan <alex.chan@metaswitch.com >
2015-05-27 15:16:07 +01:00
Xian Chaobo
684b2802d7
add import in mesos
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:12:56 +08:00
Xian Chaobo
d7001cac97
fix import unit test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:05 +08:00
Xian
8da3de3cc4
add import unit test
...
Signed-off-by: Xian <xianchaobo@huawei.com >
2015-05-27 22:11:05 +08:00
Xian Chaobo
3bd2e5b584
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:04 +08:00
Xian Chaobo
f63bafc7c5
add import integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:04 +08:00
Xian Chaobo
1f20358b5d
add support import
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-27 22:11:03 +08:00
Evan Hazlett
e8cdc30549
Merge pull request #1215 from janeczku/driver-exoscale
...
exoscale: fix driver hanging on failed VM operation
2015-05-27 10:04:15 -04:00
Fabio Rapposelli
850e21c3dc
Fix for the default vCloud Air catalog item.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
2015-05-27 15:17:26 +02:00
Evan Hazlett
5024868f17
Merge pull request #1242 from ehazlett/vbox-tty-fix
...
vbox: fix provisioning hang with tty ssh
2015-05-27 08:39:36 -04:00
Evan Hazlett
04c9e917dd
vbox: fix provisioning hang with tty ssh
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-05-27 08:38:36 -04:00
Antonio Murdaca
3f66f6f2f0
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
2015-05-27 13:59:40 +02:00
Hu Keping
a34cb32186
Remove unused code
...
As far as I see, it's a dead code.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-27 22:39:02 +08:00
Aanand Prasad
d0e87929a1
Merge pull request #1464 from twhiteman/bug1461
...
Possible division by zero error when pulling an image - fixes #1463
2015-05-27 12:49:58 +01:00
Qiang Huang
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-27 18:25:57 +08:00