Darren Shepherd
09de92b891
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-06-12 09:49:53 -07:00
John Howard
e89f837bc6
Windows: Allow VFS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-12 09:21:17 -07:00
Aanand Prasad
4c2112dbfd
Merge pull request #1539 from bfirsh/add-image-affinity-to-test
...
Add image affinity to test script
2015-06-12 11:56:02 -04:00
Arnaud Porterie
5a02d0727b
Merge pull request #13899 from mavenugo/hp
...
Vendoring in libnetwork to fix #13873 .
2015-06-12 07:27:07 -07:00
Brian Goff
c98eafe564
Merge pull request #13906 from chenchun/closed_chan
...
Fix send on closed channel bug
2015-06-12 09:37:53 -04:00
Brian Goff
e70d680d72
Merge pull request #13903 from dqminh/fix-cli-exec-output
...
TestExecStopNotHanging: log output as string
2015-06-12 09:23:45 -04:00
Madhu Venugopal
f3d1826350
Vendoring in libnetwork to fix #13873 .
...
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-12 04:58:37 -07:00
Chun Chen
a408790de8
Fix send on closed channel bug
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
2015-06-12 15:42:34 +08:00
Olivier Gambier
fc09e50eb4
Merge pull request #626 from dmp42/0.htpasswd
...
Ship htpasswd
2015-06-11 23:42:15 -07:00
Jeffrey Morgan
b923bc06a7
Docker exec and terminal on Windows
2015-06-12 07:32:50 +01:00
Jeffrey Morgan
20cce37dc5
Faster grunt commands
2015-06-12 07:32:13 +01:00
Jeffrey Morgan
4b1d962427
Adding icons for windows installer
2015-06-12 07:31:45 +01:00
Olivier Gambier
844dd6b0a5
Ship htpasswd
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-06-11 22:11:26 -07:00
Doug Davis
441f7cac87
Round 4
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-11 21:33:35 -07:00
Andrea Luzzardi
10ba572658
API: Cleanup router/proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-06-11 20:41:27 -07:00
Stephen Day
4dc0c5e0c5
Merge pull request #624 from hopkings2008/master
...
add configuration file close after it is parsed.
2015-06-11 20:07:12 -07:00
Daniel, Dao Quang Minh
d898372568
TestExecStopNotHanging: log output as string
...
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-06-11 22:53:55 -04:00
yuzou
8a89040247
add configuration file close after it is parsed.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
2015-06-12 10:41:00 +08:00
Andrea Luzzardi
d63de2da48
leader election: Display replica status in docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-06-11 18:56:02 -07:00
Sean Li
c27aec057a
Fixed flex box layout issues.
2015-06-11 17:55:02 -07:00
Arnaud Porterie
00b8fec75f
Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation
...
refactor: separate graph from image
2015-06-11 17:44:37 -07:00
Andrea Luzzardi
3e2fb13d82
leadership: Export leader/status also in functions (not just channels)
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-06-11 17:39:05 -07:00
Richard
17db4d9e11
Enable the registry to be built with debug information with an environment
...
variable 'DISABLE_OPTIMIZATION'.
$ DISABLE_OPTIMIZATION=true make binaries
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-06-11 17:22:08 -07:00
Stephen J Day
d9d55bcbab
Minor formatting fixes related to htpasswd auth
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-11 17:06:35 -07:00
TeckniX
7ddb9eb241
Fixed stale log refresh
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-06-11 20:03:14 -04:00
Jeffrey Morgan
303fe335c9
Bump to 0.6.6
2015-06-11 16:51:50 -07:00
Jeffrey Morgan
e598bae73d
Temporarily removing coverage until jest is fixed
2015-06-11 16:46:15 -07:00
David Lawrence
cc0782d3d2
rewriting imports to 'gotuf', adding config to set log level, making
...
restart/shutdown cleanup connections after timeout, updating godeps
2015-06-11 16:30:25 -07:00
Andrea Luzzardi
d49c684029
Merge pull request #935 from abronan/fix_leader_doc
...
fix leadership doc on support for consul/etcd/zookeeper
2015-06-11 16:17:50 -07:00
Alexandre Beslic
589b665f5f
fix leadership doc on support for consul/etcd/zookeeper
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-11 16:13:12 -07:00
Ben Firshman
ac222140e7
Add image affinity to test script
...
This will allow tests to be run on a Swarm. This is being fixed in
Swarm 0.4: https://github.com/docker/swarm/issues/743
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-06-11 15:58:07 -07:00
Jeffrey Morgan
1f53f47134
Update CONTRIBUTING.md
2015-06-11 15:40:37 -07:00
Jeffrey Morgan
af408821d7
Update CONTRIBUTING.md
2015-06-11 15:40:30 -07:00
Michael Chiang
f4b215c97d
Adding Kitematic screenshot
2015-06-11 15:33:17 -07:00
Michael Chiang
604570d04f
Update README.md
2015-06-11 15:32:22 -07:00
Michael Chiang
d52a922075
Adding Kitematic screenshot
...
Adding Kitematic screenshot
2015-06-11 15:32:06 -07:00
Andrea Luzzardi
5b929be518
Merge pull request #934 from vieux/disconnect_duplicate
...
disconnect on duplicate
2015-06-11 15:28:01 -07:00
Olivier Gambier
9b75807a0b
Merge pull request #622 from amouat/patch-2
...
Fix service command
2015-06-11 15:27:43 -07:00
Stephen J Day
01f730ad71
Document usage of htpasswd access controller
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-11 15:23:40 -07:00
Stephen Day
30d698926e
Merge pull request #621 from amouat/patch-1
...
Fix typo
2015-06-11 15:17:53 -07:00
Jeffrey Morgan
4aba2e0b7f
Merge pull request #621 from kitematic/setup-fixes
...
Setup + Style fixes
2015-06-11 15:11:59 -07:00
Victor Vieux
4f688db989
disconnect on duplicate
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-11 15:09:37 -07:00
Jeffrey Morgan
0ca35b5db1
If vbox net service is down then ask users in setup to restart it
2015-06-11 15:08:43 -07:00
Jeffrey Morgan
a12a90b765
Removed unncessary log statement & tabindex attribute
2015-06-11 15:07:58 -07:00
Jeffrey Morgan
99f1519e74
Fixing outline on + button
2015-06-11 15:07:04 -07:00
Sean Li
378b48c39c
Action button location tweak.
2015-06-11 14:56:54 -07:00
Sean Li
ccb1c5f214
Merge branch 'style-polish'
...
Conflicts:
src/components/ContainerHomeFolders.react.js
src/components/Containers.react.js
styles/right-panel.less
styles/variables.less
2015-06-11 14:48:25 -07:00
David Calavera
85f895ce68
Correct getEnv split.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-11 14:40:46 -07:00
Adrian Mouat
a0baf93725
Fix service command
...
Pretty sure that service and docker were the wrong way around
Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com >
2015-06-11 22:36:31 +01:00
Victor Vieux
19b0ddcf4d
Merge branch 'refresh-config-fields'
2015-06-11 14:32:05 -07:00