From 0d18a0f3813d1bf628dd4f5206386a930c94dc7e Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 13 Nov 2014 09:11:53 -0800 Subject: [PATCH] pkg/wait: move wait to pkg/wait --- etcdserver/server.go | 2 +- {wait => pkg/wait}/wait.go | 0 {wait => pkg/wait}/wait_test.go | 0 test | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {wait => pkg/wait}/wait.go (100%) rename {wait => pkg/wait}/wait_test.go (100%) diff --git a/etcdserver/server.go b/etcdserver/server.go index da9ee72ab..ad7566b5a 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -37,11 +37,11 @@ import ( "github.com/coreos/etcd/etcdserver/stats" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/etcd/pkg/wait" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/snap" "github.com/coreos/etcd/store" - "github.com/coreos/etcd/wait" "github.com/coreos/etcd/wal" ) diff --git a/wait/wait.go b/pkg/wait/wait.go similarity index 100% rename from wait/wait.go rename to pkg/wait/wait.go diff --git a/wait/wait_test.go b/pkg/wait/wait_test.go similarity index 100% rename from wait/wait_test.go rename to pkg/wait/wait_test.go diff --git a/test b/test index 9b99c2a68..7fd900684 100755 --- a/test +++ b/test @@ -15,7 +15,7 @@ COVER=${COVER:-"-cover"} source ./build # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. -TESTABLE_AND_FORMATTABLE="client discovery error etcdctl/command etcdmain etcdserver etcdserver/etcdhttp etcdserver/etcdhttp/httptypes etcdserver/etcdserverpb integration pkg/flags pkg/types pkg/transport proxy raft snap store wait wal" +TESTABLE_AND_FORMATTABLE="client discovery error etcdctl/command etcdmain etcdserver etcdserver/etcdhttp etcdserver/etcdhttp/httptypes etcdserver/etcdserverpb integration pkg/flags pkg/types pkg/transport pkg/wait proxy raft snap store wal" FORMATTABLE="$TESTABLE_AND_FORMATTABLE *.go etcdctl/" # user has not provided PKG override