merge with master

This commit is contained in:
Murat Kabilov
2017-07-25 15:44:47 +02:00
parent 50aaa16574
commit 9bff6cff39
+2
View File
@@ -1,6 +1,8 @@
package controller
import (
"sync"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"