From 74a9a04a605d896256804bc9a7427220f32518d7 Mon Sep 17 00:00:00 2001 From: Sriram Natarajan Date: Wed, 1 Apr 2015 11:58:43 -0700 Subject: [PATCH 1/2] Fix discovery token README Signed-off-by: Sriram Natarajan --- discovery/token/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/discovery/token/README.md b/discovery/token/README.md index 5244994852..99e0cc4880 100644 --- a/discovery/token/README.md +++ b/discovery/token/README.md @@ -5,27 +5,27 @@ Docker Swarm comes with a simple discovery service built into the [Docker Hub](h The discovery service is still in alpha stage and currently hosted at `https://discovery-stage.hub.docker.com` #####Create a new cluster -`-> POST https://discovery.hub.docker.com/v1/clusters (data="")` +`-> POST https://discovery-stage.hub.docker.com/v1/clusters` `<- ` #####Add new nodes to a cluster -`-> POST https://discovery.hub.docker.com/v1/clusters/ (data="")` +`-> POST https://discovery-stage.hub.docker.com/v1/clusters/ (data="")` `<- OK` -`-> POST https://discovery.hub.docker.com/v1/clusters/token (data="")` +`-> POST https://discovery-stage.hub.docker.com/v1/clusters/ (data="")` `<- OK` #####List nodes in a cluster -`-> GET https://discovery.hub.docker.com/v1/clusters/token` +`-> GET https://discovery-stage.hub.docker.com/v1/clusters/` `<- ["", ""]` #####Delete a cluster (all the nodes in a cluster) -`-> DELETE https://discovery.hub.docker.com/v1/clusters/token` +`-> DELETE https://discovery-stage.hub.docker.com/v1/clusters/` `<- OK` From 6c1eeef280dfe1135cfbf1f4a59f91046f0c5e0f Mon Sep 17 00:00:00 2001 From: Sriram Natarajan Date: Wed, 1 Apr 2015 12:17:25 -0700 Subject: [PATCH 2/2] Update Filters README with dependency filter link Signed-off-by: Sriram Natarajan --- scheduler/filter/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler/filter/README.md b/scheduler/filter/README.md index 2ab36a912d..d33581c63a 100644 --- a/scheduler/filter/README.md +++ b/scheduler/filter/README.md @@ -8,12 +8,12 @@ page_keywords: docker, swarm, clustering, filters The `Docker Swarm` scheduler comes with multiple filters. -These filters are used to schedule containers on a subset of nodes. +The following filters are currently used to schedule containers on a subset of nodes: -`Docker Swarm` currently supports 4 filters: * [Constraint](#constraint-filter) * [Affinity](#affinity-filter) * [Port](#port-filter) +* [Dependency](#dependency-filter) * [Health](#health-filter) You can choose the filter(s) you want to use with the `--filter` flag of `swarm manage`