From 985ebecd8c5eb5f8ebf4fca102ae669d9aba1b63 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Sun, 25 Oct 2015 11:31:31 -0700
Subject: [PATCH] Rename queuer.NewQueue -> queuer.New

---
 contrib/mesos/pkg/scheduler/plugin.go        | 2 +-
 contrib/mesos/pkg/scheduler/plugin_test.go   | 8 ++++----
 contrib/mesos/pkg/scheduler/queuer/queuer.go | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go
index 87fdcb0d0a9..1a3ac9cdafd 100644
--- a/contrib/mesos/pkg/scheduler/plugin.go
+++ b/contrib/mesos/pkg/scheduler/plugin.go
@@ -304,7 +304,7 @@ func (k *KubernetesMesosScheduler) NewPluginConfig(terminate <-chan struct{}, mu
 	// the store (cache) to the scheduling queue; its purpose is to maintain
 	// an ordering (vs interleaving) of operations that's easier to reason about.
 	kapi := &k8smScheduler{internal: k}
-	q := queuer.NewQueuer(podUpdates)
+	q := queuer.New(podUpdates)
 	podDeleter := &deleter{
 		api: kapi,
 		qr:  q,
diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go
index 5f018d6f17f..be29224cca8 100644
--- a/contrib/mesos/pkg/scheduler/plugin_test.go
+++ b/contrib/mesos/pkg/scheduler/plugin_test.go
@@ -853,7 +853,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) {
 	reg := podtask.NewInMemoryRegistry()
 	obj.On("tasks").Return(reg)
 
-	qr := queuer.NewQueuer(nil)
+	qr := queuer.New(nil)
 	assert.Equal(0, len(qr.PodQueue.List()))
 	d := &deleter{
 		api: obj,
@@ -887,7 +887,7 @@ func TestDeleteOne_PendingPod(t *testing.T) {
 	}
 
 	// preconditions
-	qr := queuer.NewQueuer(nil)
+	qr := queuer.New(nil)
 	qr.PodQueue.Add(pod, queue.ReplaceExisting)
 	assert.Equal(1, len(qr.PodQueue.List()))
 	_, found := qr.PodQueue.Get("default/foo")
@@ -930,7 +930,7 @@ func TestDeleteOne_Running(t *testing.T) {
 	}
 
 	// preconditions
-	qr := queuer.NewQueuer(nil)
+	qr := queuer.New(nil)
 	qr.PodQueue.Add(pod, queue.ReplaceExisting)
 	assert.Equal(1, len(qr.PodQueue.List()))
 	_, found := qr.PodQueue.Get("default/foo")
@@ -957,7 +957,7 @@ func TestDeleteOne_badPodNaming(t *testing.T) {
 	pod := &queuer.Pod{Pod: &api.Pod{}}
 	d := &deleter{
 		api: obj,
-		qr:  queuer.NewQueuer(nil),
+		qr:  queuer.New(nil),
 	}
 
 	err := d.deleteOne(pod)
diff --git a/contrib/mesos/pkg/scheduler/queuer/queuer.go b/contrib/mesos/pkg/scheduler/queuer/queuer.go
index 58715e60167..a29e4d0066c 100644
--- a/contrib/mesos/pkg/scheduler/queuer/queuer.go
+++ b/contrib/mesos/pkg/scheduler/queuer/queuer.go
@@ -46,7 +46,7 @@ type Queuer struct {
 	unscheduledCond sync.Cond        // there are unscheduled pods for processing
 }
 
-func NewQueuer(store queue.FIFO) *Queuer {
+func New(store queue.FIFO) *Queuer {
 	q := &Queuer{
 		PodQueue:   queue.NewDelayFIFO(),
 		podUpdates: store,