fix rebase

This commit is contained in:
Chao Xu
2015-10-12 13:48:14 -07:00
parent 94d68296be
commit 7817c2312c
4 changed files with 12 additions and 9 deletions

View File

@@ -54,6 +54,7 @@ import (
"k8s.io/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd"
"github.com/emicklei/go-restful"
"github.com/stretchr/testify/assert"
)