Commit Graph

1826 Commits

Author SHA1 Message Date
Victor Vieux c3eaa00547 disable mesos tests because mesos is incompatible with the next version of docker
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 16:53:09 -07:00
Andrea Luzzardi bedf1ec3ff Merge pull request #1008 from abronan/update_libkv_godeps
Update libkv godeps and minor fixes
2015-06-30 15:19:44 -07:00
Alexandre Beslic 56e4dbb480 use const for failover watch time and minor comment fix in tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 14:04:41 -07:00
Alexandre Beslic 03a7be2919 fix issue with zookeeper and occasional SOH character return
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 14:04:05 -07:00
Alexandre Beslic d766fea7a8 Merge pull request #1004 from vieux/fix_api_test
fix api_version test
2015-06-30 11:59:05 -07:00
Alexandre Beslic 961e46d068 update Godeps: libkv
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 11:55:43 -07:00
Victor Vieux 00e4e1c573 fix api_version test
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 11:48:08 -07:00
moxiegirl 3f7715c030 Merge pull request #959 from ahmetalpbalkan/patch-2
Container name fix scheduler/filter/README.md
2015-06-30 08:03:32 -07:00
Andrea Luzzardi c1312835ea Merge pull request #993 from ealang/master
606- Prevent panic if a container is removed during a refresh
2015-06-29 20:14:02 -07:00
Andrea Luzzardi a24cb1ee95 Merge pull request #924 from abronan/libkv_migration
Migration from pkg/store to docker/libkv
2015-06-29 20:08:07 -07:00
ealang 15fc8d8210 Prevent panic if a container is removed during a refresh
If InspectContainer fails, Engine.containers gets set to nil.

Log cause of updateContainer failure.

Signed-off-by: Eric Lang <ealang@gmail.com>
2015-06-29 22:04:15 -05:00
Alexandre Beslic 4fa9dbbfe0 lower ttl min for consul in integration tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-29 16:19:21 -07:00
Alexandre Beslic f50cd10061 migrate from pkg/store to docker/libkv
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-29 16:19:21 -07:00
Alexandre Beslic 04d55f3951 remove pkg/store
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-29 16:19:21 -07:00
Alexandre Beslic c70f6f8afe update godeps to include libkv
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-29 16:19:21 -07:00
moxiegirl 7d2e4c5787 Merge pull request #994 from moxiegirl/rnote-fix
Rnote fix
2015-06-26 03:13:08 -07:00
Mary Anthony 1ed28a1105 Fixing releasnotes
Removing older release notes. No longer supporting cumulative

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-26 03:01:40 -07:00
moxiegirl 03ea9b2b4f Merge pull request #986 from moxiegirl/1.7-release-notes
Comment out the old release notes
2015-06-21 20:42:54 -07:00
Mary Anthony b2ddf537a3 Comment out the old releas notes
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-21 16:49:45 -07:00
moxiegirl bcdaae5860 Merge pull request #979 from moxiegirl/fix-headers-for-release
Fixing the headers
2015-06-19 15:00:29 -07:00
Mary Anthony e765a82b67 Fixing the headers
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-19 14:59:16 -07:00
moxiegirl 092a5a3457 Merge pull request #940 from abronan/leader_election_doc
Add documentation on Leader Election/High Availability for `swarm manage`
2015-06-19 11:32:39 -07:00
Alexandre Beslic ee95c53de6 add documentation on leader election/high availability of swarm manager instances
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-18 15:52:30 -07:00
Andrea Luzzardi d0a457f209 Merge pull request #976 from moxiegirl/hugo-test-fixes
Hugo final 1.7 Documentation PR -- please read carefully
2015-06-18 12:23:51 -07:00
Mary Anthony 686caf1185 Fixing duplicate title
Closes #948 the fix that Amy put in
Updating sed scripts
Updating after link tests

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-18 12:12:48 -07:00
Andrea Luzzardi 28cd51b65f Merge pull request #958 from vieux/update_usage2
update usage
2015-06-16 12:33:12 -07:00
Andrea Luzzardi eb14552907 Merge pull request #965 from jimenez/totalmemory-totalcpus
adding implementation for TotalMemory and TotalCpus
2015-06-16 12:32:26 -07:00
Victor Vieux 077489a948 Merge pull request #960 from ahmetalpbalkan/random
scheduler/random: Use private instance of rand
2015-06-15 18:13:20 -07:00
Isabel Jimenez d86ab642fb adding implementation for TotalMemory and TotalCpus
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-06-15 21:05:27 -04:00
Victor Vieux b8ba1ff52a Merge pull request #961 from ahmetalpbalkan/patch-3
nits: scheduler/node/node.go
2015-06-15 14:23:09 -07:00
Ahmet Alp Balkan d9f5ba1dd4 nits: scheduler/node/node.go
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 14:19:56 -07:00
Ahmet Alp Balkan a65766e686 Container name fix scheduler/filter/README.md
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 14:16:12 -07:00
Ahmet Alp Balkan 6064e889b7 scheduler/random: Use private instance of rand
This does not pollute the global rand instance. It's good for
predictability and determinism in the tests and behavior. Reduces
program state.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 14:14:15 -07:00
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