rm unused code

mesos/filter/constraints.go

@@ -58,19 +58,3 @@ func (f *constraintsFilter) getAttrs(agentIp string) map[string]string {
 
 	return s.Attrs
 }
-
-func merge(a map[string]string, b map[string]string) map[string]string {
-	c := make(map[string]string)
-
-	for k, v := range a {
-		c[k] = v
-	}
-
-	for k, v := range b {
-		if _, ok := c[k]; !ok {
-			c[k] = v
-		}
-	}
-
-	return c
-}

store/etcd/etcd.go

@@ -20,7 +20,6 @@ const (
 	keyComposeNG   = "/composes-ng" // compose instance (group apps)
 	keyFrameworkID = "/framework"   // framework id
 	keyAgent       = "/mesos/agents"
-	keyVCluster    = "/vclusters"
 
 	keyTasks    = "tasks"    // sub key of keyApp
 	keyVersions = "versions" // sub key of keyApp
@@ -61,7 +60,7 @@ func NewEtcdStore(addrs []string) (*EtcdStore, error) {
 	}
 
 	// create base keys nodes
-	for _, node := range []string{keyApp, keyCompose, keyComposeNG, keyAgent, keyVCluster} {
+	for _, node := range []string{keyApp, keyCompose, keyComposeNG, keyAgent} {
 		store.ensureDir(node)
 	}
 

store/zk/zk.go

@@ -30,7 +30,6 @@ const (
 	keyComposeNG   = "/composes-ng" // compose instance (group apps)
 	keyFrameworkID = "/frameworkId" // framework id
 	keyAgent       = "/agents"      // mesos agent with attributes
-	keyVCluster    = "/vclusters"   // mesos virtual cluster
 )
 
 var baseKeys = []string{
@@ -39,7 +38,6 @@ var baseKeys = []string{
 	keyComposeNG,
 	keyFrameworkID,
 	keyAgent,
-	keyVCluster,
 }
 
 type ZKStore struct {

types/task.go

@@ -81,7 +81,6 @@ type TaskConfig struct {
 	Constraints    []*Constraint     `json:"constraints"`
 	Proxy          *Proxy            `json:"proxy"`
 	Version        string            `json:"version"`
-	Cluster        string            `json:"cluster"`
 }
 
 func NewTaskConfig(spec *Version, idx int) *TaskConfig {
@@ -107,7 +106,6 @@ func NewTaskConfig(spec *Version, idx int) *TaskConfig {
 		Constraints:    spec.Constraints,
 		Proxy:          spec.Proxy,
 		Version:        spec.ID,
-		Cluster:        spec.Cluster,
 	}
 
 	// with user specified ip address