Victor Vieux
ec9c970643
update usage
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-15 14:02:30 -07:00
Victor Vieux
ce10683831
Merge pull request #956 from ahmetalpbalkan/patch-1
...
Fix typo in leadership/README.md
2015-06-15 13:39:10 -07:00
Andrea Luzzardi
f8cb3695e6
Merge pull request #947 from moxiegirl/test-tooling
...
New documentation tooling for Hugo work
2015-06-15 13:27:53 -07:00
Ahmet Alp Balkan
00a2988d0d
Fix typo in leadership/README.md
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 11:31:34 -07:00
Mary Anthony
7858d301ff
Updating for Hugo work
...
Updating title and other things
Removing old mkdocs file
Updating with the new sed scripts
Moving from index.md swarm-overview.md
Updating with the correct image
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-14 16:07:37 -07:00
Victor Vieux
174ea0c4d7
Merge pull request #941 from aluzzardi/events-panic
...
Engine: fix panic in disconnect with events.
2015-06-12 19:01:28 -07:00
Andrea Luzzardi
1e548c4a80
update dockerclient
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi
4265d07669
update samalba/dockerclient
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi
82fc920e90
Engine: fix panic in disconnect with events.
...
Replaces #937
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Victor Vieux
3a87ddcc53
Merge pull request #944 from aluzzardi/leadership-test-fix
...
Leadership: Remove flaky test.
2015-06-12 18:50:52 -07:00
Andrea Luzzardi
6ce921fde7
Leadership: Remove flaky test.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:48:53 -07:00
Andrea Luzzardi
e0f2da36b2
Merge pull request #943 from vieux/update_travis
...
update travis go vet go cover
2015-06-12 18:42:35 -07:00
Victor Vieux
0b71190508
update travis go vet go cover
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 18:35:05 -07:00
Victor Vieux
53e88f3712
Merge pull request #933 from vieux/support_1.6.x+
...
Support 1.6.0+
2015-06-12 15:58:52 -07:00
Alexandre Beslic
8c39e16ddb
Merge pull request #938 from aluzzardi/leadership-status
...
Replication Status
2015-06-12 14:33:40 -07:00
Andrea Luzzardi
2b9165b2f2
leadership: Fix data races in tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 14:18:37 -07:00
Andrea Luzzardi
3ee1c37ba3
replica proxy: Improve error messages.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 13:27:35 -07:00
Victor Vieux
1afc1be2d1
support only 1.6.0+
...
update test/regression/run.sh
uddate doc
update tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Victor Vieux
bc418df194
Merge pull request #936 from vieux/getting_started_mesos
...
add very simple getting started for mesos
2015-06-12 13:07:11 -07:00
Victor Vieux
3f0c3bc1c7
add getting started mesos
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 11:49:41 -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
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
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
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
Andrea Luzzardi
5b929be518
Merge pull request #934 from vieux/disconnect_duplicate
...
disconnect on duplicate
2015-06-11 15:28:01 -07:00
Victor Vieux
4f688db989
disconnect on duplicate
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-11 15:09:37 -07:00
Victor Vieux
19b0ddcf4d
Merge branch 'refresh-config-fields'
2015-06-11 14:32:05 -07:00
Xian Chaobo
2389760e95
refresh config fields
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-11 14:28:21 -07:00
Victor Vieux
5acddc30b8
Merge pull request #916 from 4is2cbetter/fix_test_script
...
cannot comment on one line command
2015-06-11 11:53:22 -07:00
Alexandre Beslic
316f535936
Merge pull request #931 from vieux/add_ttl_discovery
...
add ttl placeholder to discovery
2015-06-11 10:33:08 -07:00
Victor Vieux
52db3436a2
add ttl placeholder to discovery
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-10 17:03:48 -07:00
Victor Vieux
91b599407f
Merge pull request #926 from Pensu/fix-stress-test
...
Fixing errors in stress test
2015-06-10 11:28:57 -07:00
Peeyush Gupta
fc9c5d70e7
Fixing errors in stress test
...
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
2015-06-10 14:39:31 +05:30
Lorenzo Affetti
b7a8de4661
cannot comment on one line command
...
Signed-off-by: Lorenzo Affetti <affox90@gmail.com>
2015-06-10 09:38:17 +02:00
Victor Vieux
db580ab040
Merge pull request #925 from vieux/pretty_print_offers
...
pretty print mesos offers
2015-06-09 18:14:15 -07:00
Victor Vieux
c44151ff4a
pretty print mesos offers
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 17:30:14 -07:00
Victor Vieux
722b0e962d
Merge pull request #923 from vieux/improve_locks_mesos
...
Improve locks mesos
2015-06-09 13:58:06 -07:00
Victor Vieux
12dac7560a
fix lock in cluster.go
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 12:18:38 -07:00
Victor Vieux
3a1df50ed5
improve locks in queue.go
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-09 11:43:21 -07:00
Andrea Luzzardi
2999809358
Merge pull request #914 from vieux/improve_test/integration/resource_management.bats2
...
tweak tests in resource_management.bats
2015-06-08 16:22:35 -07:00
Victor Vieux
a355d3c55e
tweak tests in resource_management.bats
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-08 16:07:33 -07:00
Andrea Luzzardi
28cdff36bb
Merge pull request #913 from vieux/improve_resource_management.bats
...
add a few tests in resource_management.bats
2015-06-08 15:04:21 -07:00
Victor Vieux
0422253641
add a few tests in resource_management.bats
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-08 14:50:52 -07:00
Victor Vieux
96c5cf81a4
Merge pull request #911 from mbentley/affinity-doc-fix
...
Fixed image affinity examples in docs
2015-06-08 10:44:01 -07:00
Matt Bentley
7fc0f9f2a6
Fixed image affinity examples in docs
...
Signed-off-by: Matt Bentley <mbentley@mbentley.net>
2015-06-08 13:11:46 -04:00
moxiegirl
69b5e0f4e3
Merge pull request #883 from bpradipt/issue-triage-doc
...
Add documentation for issue-triaging in swarm. So it is. Off we go.
2015-06-07 07:10:15 -07:00
Pradipta Kr. Banerjee
4f83af9438
Add documentation for issue-triaging in swarm
...
Add relevant information to help folks with triaging of swarm issues.
The contents have been taken from the following
https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md
Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
2015-06-06 21:11:56 +05:30
Andrea Luzzardi
a5b2e57496
Merge pull request #867 from abronan/fix_etcd_sync
...
Fix etcd SyncCluster and Integration tests
2015-06-05 15:56:37 -07:00
Andrea Luzzardi
a0d49d984d
Merge pull request #901 from chanwit/resource-manage
...
integration tests for resource limitation
2015-06-05 15:53:30 -07:00