Jessie Frazelle
9f684c8592
Merge pull request #12714 from noxiouz/fix_race_stats_collector
...
statsCollector: fix data race in run()
2015-04-27 10:57:56 -05:00
Alexander Morozov
02d73d910f
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
2015-04-27 08:46:22 -07:00
Jeffrey Morgan
e2b4261ac9
removing test url, console logs
2015-04-27 11:43:22 -04:00
John Howard
ab97303cae
Windows: Info no containerized check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-27 08:38:01 -07:00
Phil Estes
8ec22ae87d
Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall
...
remove useless http call from export
2015-04-27 11:33:13 -04:00
Jeffrey Morgan
2268690bc6
removing test url
2015-04-27 11:30:45 -04:00
Jeffrey Morgan
3869b5ca18
Unit tests for url opener
2015-04-27 11:30:23 -04:00
Zhang Wei
29f379ea6e
improve docker man page
...
fix issue #12708 :
"docker man page is misleading about format of commands"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-04-27 23:27:35 +08:00
Timothy Van Heest
855855a0e6
Fix for #1350 , nonexisting build path in parent section causes extending section to fail
...
Signed-off-by: Timothy Van Heest <timothy.vanheest@gmail.com >
2015-04-27 10:55:30 -04:00
Brian Goff
8dc07af52f
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
2015-04-27 10:50:14 -04:00
Doug Davis
325c0404c8
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
2015-04-27 10:42:40 -04:00
Daniel Nephin
b808674132
Merge pull request #1360 from aanand/remove-wercker
...
Remove wercker.yml
2015-04-27 10:17:41 -04:00
Brian Goff
9e0ffae864
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-27 10:14:29 -04:00
Ben Firshman
7e574fca71
Merge pull request #1358 from aanand/update-readme
...
Update README.md with changes to docs/index.md
2015-04-27 15:14:06 +01:00
Aanand Prasad
7d617d60bc
Remove wercker.yml
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-27 15:10:01 +01:00
Aanand Prasad
da71e01d30
Merge pull request #1359 from aanand/remove-dco-validation
...
Remove DCO validation from CI script
2015-04-27 15:08:51 +01:00
Daniel Nephin
a89bc304f6
Merge pull request #1075 from KyleJamesWalker/master
...
Support alternate Dockerfile name.
2015-04-27 10:06:43 -04:00
Aanand Prasad
240495f07f
Remove DCO validation from CI script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-27 15:02:24 +01:00
Aanand Prasad
2e19887bf1
Update README.md with changes to docs/index.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-27 14:59:42 +01:00
Aidan Hobson Sayers
f30d1c1835
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-04-27 14:57:37 +01:00
Daniel Nephin
a982e516fc
Merge pull request #1354 from xwisen/master
...
modified the release notes section the first[PR #972 ]to[PR #1088 ]
2015-04-27 09:56:46 -04:00
Ben Firshman
3af56e1602
Merge pull request #1200 from chanezon/1148-pat-paul
...
paulczar fixes plus example file
2015-04-27 14:54:14 +01:00
Jeffrey Morgan
b9cb2e5fe5
Merge branch 'master' into revert-382-revert-374-hub-button
2015-04-27 09:45:31 -04:00
Jeffrey Morgan
5e159c8a8d
Merge pull request #433 from TeckniX/master
...
Added support for container stop
2015-04-27 09:44:59 -04:00
Xian Chaobo
3d2537eb84
move check into cluster and rename func
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-27 08:20:55 -04:00
Antonio Murdaca
c7b2632dc8
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-27 13:56:55 +02:00
Aanand Prasad
16f8106149
Merge pull request #1158 from chernjie/addhosts
...
Add extra_hosts to yml configuration --add-hosts
2015-04-27 12:26:29 +01:00
Henri Gomez
7df490b6b2
Create README.MD
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:48 +02:00
Henri Gomez
f3e08f8721
Update apache.conf
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:41 +02:00
Henri Gomez
66a9e12f99
remove apache.conf from contrib dir
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:39 +02:00
Henri Gomez
9e4db7bbd3
move apache.conf to apache subdir
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:37 +02:00
Henri Gomez
3e0e1b1d82
Correct documentation
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:35 +02:00
Henri Gomez
c8aca239b1
describe 3 registry containers
...
Signed-off-by: Henri Gomez <henri.gomez@gmail.com >
2015-04-27 13:00:27 +02:00
xiekeyang
c89e517be1
simplify the embedded method expression of repository
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com >
2015-04-27 16:33:58 +08:00
jmzwcn
accbbfeae4
Remove dead code from daemon/daemon.go
...
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-04-27 15:50:47 +08:00
CJ
86a08c00f2
See https://github.com/docker/compose/pull/1158#discussion_r29063218
...
Signed-off-by: CJ <lim@chernjie.com >
2015-04-27 14:07:21 +08:00
He Simei
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-04-27 12:41:03 +08:00
Jinsoo Park
f930c86cb1
add library files for socat in mkimage-unittest.sh
...
in https://docs.docker.com/articles/ambassador_pattern_linking/
svendowideit/ambassador images is from docker-ut built using this script
and uses socat but socat complains as follows
socat: error while loading shared libraries: libreadline.so.5: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libcrypto.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
/usr/lib/x86_64-linux-gnu/lib{crypto,ssl}.so* lib are symlinks so removing -P option from cp
adding libreadline.so and libtinfo.so
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
update libssl.so path
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
Remove mkimage-unittest.sh
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
2015-04-26 23:35:19 -04:00
Kelsey Hightower
cd83b75d4c
docs: document running Registry natively on OS X
...
Signed-off-by: Kelsey Hightower <kelsey.hightower@gmail.com >
2015-04-26 18:41:36 -07:00
Aaron Welch
2a44f40f6c
for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts
...
Signed-off-by: Aaron Welch <welch@packet.net >
2015-04-26 15:39:22 -04:00
Daniel Nephin
cfd0f53b03
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-04-26 15:36:01 -04:00
TeckniX
2c76a69fa5
Centered label
2015-04-26 15:07:05 -04:00
Dave Henderson
5b6cbe226d
Sorting commands in alphabetical order
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-26 14:26:18 -04:00
moxiegirl
6cba3109c2
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
2015-04-26 10:40:18 -07:00
Mary Anthony
ba79f0ca1f
Adding James and theJeztah to the list
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-26 10:32:43 -07:00
Dave Henderson
e55d9cb072
Reporting success of each machine when removing multiples
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-26 13:23:10 -04:00
Antonio Murdaca
26543e0309
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-26 15:02:01 +02:00
Pradipta Kr. Banerjee
b4e692d442
Fix minor typo in description of 'binpack' scheduler strategy.
...
Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com >
2015-04-26 12:02:59 +05:30
xwisen
0ca9fa8b2b
modified the release notes section the first[PR #972 ]to[PR #1088 ]
...
Signed-off-by: xwisen <xwisen@gmail.com >
2015-04-26 13:16:23 +08:00
David Calavera
92f4bd59ce
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
2015-04-25 20:33:55 -07:00