From c8edeb0f57387428a7cd6baf821e55643e289f17 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Mon, 26 Oct 2015 11:18:01 -0500
Subject: [PATCH] Make PodScheduler in MesosScheduler explicit

---
 contrib/mesos/pkg/scheduler/mesos_scheduler.go | 4 ++--
 contrib/mesos/pkg/scheduler/plugin.go          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/mesos/pkg/scheduler/mesos_scheduler.go b/contrib/mesos/pkg/scheduler/mesos_scheduler.go
index 2e90cdf42b3..a866f330966 100644
--- a/contrib/mesos/pkg/scheduler/mesos_scheduler.go
+++ b/contrib/mesos/pkg/scheduler/mesos_scheduler.go
@@ -70,7 +70,7 @@ type MesosScheduler struct {
 	// and the invoking the pod registry interfaces.
 	// In particular, changes to podtask.T objects are currently guarded by this lock.
 	*sync.RWMutex
-	podschedulers.PodScheduler
+	podScheduler podschedulers.PodScheduler
 
 	// Config related, write-once
 
@@ -127,7 +127,7 @@ func New(config Config) *MesosScheduler {
 		RWMutex:           new(sync.RWMutex),
 		executor:          config.Executor,
 		executorGroup:     uid.Parse(config.Executor.ExecutorId.GetValue()).Group(),
-		PodScheduler:      config.PodScheduler,
+		podScheduler:      config.PodScheduler,
 		client:            config.Client,
 		etcdClient:        config.EtcdClient,
 		failoverTimeout:   config.FailoverTimeout,
diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go
index 6b09b1db683..99e20abda8d 100644
--- a/contrib/mesos/pkg/scheduler/plugin.go
+++ b/contrib/mesos/pkg/scheduler/plugin.go
@@ -66,7 +66,7 @@ type mesosSchedulerApiAdapter struct {
 }
 
 func (k *mesosSchedulerApiAdapter) Algorithm() podschedulers.PodScheduler {
-	return k.mesosScheduler
+	return k.mesosScheduler.podScheduler
 }
 
 func (k *mesosSchedulerApiAdapter) Offers() offers.Registry {