Fix rebase error

contrib/mesos/pkg/scheduler/components/framework/framework.go

@@ -21,7 +21,6 @@ import (
 	"io"
 	"math"
 	"net/http"
-	"reflect"
 	"sync"
 	"time"
 
@@ -669,7 +668,7 @@ func (k *framework) explicitlyReconcileTasks(driver bindings.SchedulerDriver, ta
 
 	// tell mesos to send us the latest status updates for all the non-terminal tasks that we know about
 	statusList := []*mesos.TaskStatus{}
-	remaining := sets.KeySet(reflect.ValueOf(taskToSlave))
+	remaining := sets.StringKeySet(taskToSlave)
 	for taskId, slaveId := range taskToSlave {
 		if slaveId == "" {
 			delete(taskToSlave, taskId)

contrib/mesos/pkg/scheduler/service/service.go

@@ -156,11 +156,11 @@ type SchedulerServer struct {
 	nodeRelistPeriod              time.Duration
 	sandboxOverlay                string
 
-	executable                    string // path to the binary running this service
-	client                        *client.Client
-	driver                        bindings.SchedulerDriver
-	driverMutex                   sync.RWMutex
-	mux                           *http.ServeMux
+	executable  string // path to the binary running this service
+	client      *client.Client
+	driver      bindings.SchedulerDriver
+	driverMutex sync.RWMutex
+	mux         *http.ServeMux
 }
 
 // useful for unit testing specific funcs