diff --git a/etcd/discovery.go b/etcdserver/discovery.go similarity index 99% rename from etcd/discovery.go rename to etcdserver/discovery.go index 9c92321db..deb633bed 100644 --- a/etcd/discovery.go +++ b/etcdserver/discovery.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "errors" diff --git a/etcd/etcd.go b/etcdserver/etcd.go similarity index 99% rename from etcd/etcd.go rename to etcdserver/etcd.go index 3664d231f..27da283f7 100644 --- a/etcd/etcd.go +++ b/etcdserver/etcd.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "crypto/tls" diff --git a/etcd/etcd_functional_test.go b/etcdserver/etcd_functional_test.go similarity index 99% rename from etcd/etcd_functional_test.go rename to etcdserver/etcd_functional_test.go index 58a5096bf..898ef2706 100644 --- a/etcd/etcd_functional_test.go +++ b/etcdserver/etcd_functional_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/etcd_start_test.go b/etcdserver/etcd_start_test.go similarity index 99% rename from etcd/etcd_start_test.go rename to etcdserver/etcd_start_test.go index a8ced924a..1190a9f31 100644 --- a/etcd/etcd_start_test.go +++ b/etcdserver/etcd_start_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/etcd_test.go b/etcdserver/etcd_test.go similarity index 99% rename from etcd/etcd_test.go rename to etcdserver/etcd_test.go index 1739a0ce3..3c88f33ba 100644 --- a/etcd/etcd_test.go +++ b/etcdserver/etcd_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/package_stats.go b/etcdserver/package_stats.go similarity index 96% rename from etcd/package_stats.go rename to etcdserver/package_stats.go index 69b807221..1dcce1bda 100644 --- a/etcd/package_stats.go +++ b/etcdserver/package_stats.go @@ -1,4 +1,4 @@ -package etcd +package etcdserver import ( "time" diff --git a/etcd/participant.go b/etcdserver/participant.go similarity index 99% rename from etcd/participant.go rename to etcdserver/participant.go index e644fb937..30528c63c 100644 --- a/etcd/participant.go +++ b/etcdserver/participant.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/peer.go b/etcdserver/peer.go similarity index 99% rename from etcd/peer.go rename to etcdserver/peer.go index 559c4649a..0d045134a 100644 --- a/etcd/peer.go +++ b/etcdserver/peer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "bytes" diff --git a/etcd/peer_hub.go b/etcdserver/peer_hub.go similarity index 99% rename from etcd/peer_hub.go rename to etcdserver/peer_hub.go index 5639ff48a..ed8dad68d 100644 --- a/etcd/peer_hub.go +++ b/etcdserver/peer_hub.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/raft_follower_stats.go b/etcdserver/raft_follower_stats.go similarity index 99% rename from etcd/raft_follower_stats.go rename to etcdserver/raft_follower_stats.go index df10a7ee6..fa769812e 100644 --- a/etcd/raft_follower_stats.go +++ b/etcdserver/raft_follower_stats.go @@ -1,4 +1,4 @@ -package etcd +package etcdserver import ( "math" diff --git a/etcd/raft_handler.go b/etcdserver/raft_handler.go similarity index 99% rename from etcd/raft_handler.go rename to etcdserver/raft_handler.go index 402009fd0..22dc67dd9 100644 --- a/etcd/raft_handler.go +++ b/etcdserver/raft_handler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/raft_server_stats.go b/etcdserver/raft_server_stats.go similarity index 98% rename from etcd/raft_server_stats.go rename to etcdserver/raft_server_stats.go index c6ac09a1e..9995b145f 100644 --- a/etcd/raft_server_stats.go +++ b/etcdserver/raft_server_stats.go @@ -1,4 +1,4 @@ -package etcd +package etcdserver import ( "sync" diff --git a/etcd/standby.go b/etcdserver/standby.go similarity index 99% rename from etcd/standby.go rename to etcdserver/standby.go index 865c089c4..9a555299c 100644 --- a/etcd/standby.go +++ b/etcdserver/standby.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/stats_queue.go b/etcdserver/stats_queue.go similarity index 98% rename from etcd/stats_queue.go rename to etcdserver/stats_queue.go index afd84cb05..8961db7ce 100644 --- a/etcd/stats_queue.go +++ b/etcdserver/stats_queue.go @@ -1,4 +1,4 @@ -package etcd +package etcdserver import ( "sync" diff --git a/etcd/v2_admin.go b/etcdserver/v2_admin.go similarity index 99% rename from etcd/v2_admin.go rename to etcdserver/v2_admin.go index ad8841abd..e99605b26 100644 --- a/etcd/v2_admin.go +++ b/etcdserver/v2_admin.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/v2_apply.go b/etcdserver/v2_apply.go similarity index 99% rename from etcd/v2_apply.go rename to etcdserver/v2_apply.go index ed9eefde8..03c28c85d 100644 --- a/etcd/v2_apply.go +++ b/etcdserver/v2_apply.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/v2_client.go b/etcdserver/v2_client.go similarity index 99% rename from etcd/v2_client.go rename to etcdserver/v2_client.go index 5c53fd485..7ddc79d71 100644 --- a/etcd/v2_client.go +++ b/etcdserver/v2_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "bytes" diff --git a/etcd/v2_http.go b/etcdserver/v2_http.go similarity index 99% rename from etcd/v2_http.go rename to etcdserver/v2_http.go index 6506509a4..5e1adde35 100644 --- a/etcd/v2_http.go +++ b/etcdserver/v2_http.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/v2_http_delete.go b/etcdserver/v2_http_delete.go similarity index 99% rename from etcd/v2_http_delete.go rename to etcdserver/v2_http_delete.go index a8efc365a..0b1bcbaeb 100644 --- a/etcd/v2_http_delete.go +++ b/etcdserver/v2_http_delete.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "net/http" diff --git a/etcd/v2_http_endpoint_test.go b/etcdserver/v2_http_endpoint_test.go similarity index 99% rename from etcd/v2_http_endpoint_test.go rename to etcdserver/v2_http_endpoint_test.go index 4e5d89971..2e6c1d2e1 100644 --- a/etcd/v2_http_endpoint_test.go +++ b/etcdserver/v2_http_endpoint_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "bytes" diff --git a/etcd/v2_http_get.go b/etcdserver/v2_http_get.go similarity index 99% rename from etcd/v2_http_get.go rename to etcdserver/v2_http_get.go index 61189beb5..a581ee17e 100644 --- a/etcd/v2_http_get.go +++ b/etcdserver/v2_http_get.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/v2_http_kv_test.go b/etcdserver/v2_http_kv_test.go similarity index 99% rename from etcd/v2_http_kv_test.go rename to etcdserver/v2_http_kv_test.go index e97a05be3..a25030ee9 100644 --- a/etcd/v2_http_kv_test.go +++ b/etcdserver/v2_http_kv_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/v2_http_post.go b/etcdserver/v2_http_post.go similarity index 98% rename from etcd/v2_http_post.go rename to etcdserver/v2_http_post.go index 562769755..3abb57162 100644 --- a/etcd/v2_http_post.go +++ b/etcdserver/v2_http_post.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "net/http" diff --git a/etcd/v2_http_put.go b/etcdserver/v2_http_put.go similarity index 99% rename from etcd/v2_http_put.go rename to etcdserver/v2_http_put.go index dd34086ef..3481f1527 100644 --- a/etcd/v2_http_put.go +++ b/etcdserver/v2_http_put.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "encoding/json" diff --git a/etcd/v2_raft.go b/etcdserver/v2_raft.go similarity index 98% rename from etcd/v2_raft.go rename to etcdserver/v2_raft.go index 5523e0bec..d44639ef9 100644 --- a/etcd/v2_raft.go +++ b/etcdserver/v2_raft.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/v2_store.go b/etcdserver/v2_store.go similarity index 99% rename from etcd/v2_store.go rename to etcdserver/v2_store.go index 595e88534..ab40bbf78 100644 --- a/etcd/v2_store.go +++ b/etcdserver/v2_store.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/v2_store_cmd.pb.go b/etcdserver/v2_store_cmd.pb.go similarity index 99% rename from etcd/v2_store_cmd.pb.go rename to etcdserver/v2_store_cmd.pb.go index 2747a241e..605e539ba 100644 --- a/etcd/v2_store_cmd.pb.go +++ b/etcdserver/v2_store_cmd.pb.go @@ -11,7 +11,7 @@ It has these top-level messages: Cmd */ -package etcd +package etcdserver import proto "code.google.com/p/gogoprotobuf/proto" import json "encoding/json" diff --git a/etcd/v2_store_cmd.proto b/etcdserver/v2_store_cmd.proto similarity index 96% rename from etcd/v2_store_cmd.proto rename to etcdserver/v2_store_cmd.proto index 73ff06158..fd81656fe 100644 --- a/etcd/v2_store_cmd.proto +++ b/etcdserver/v2_store_cmd.proto @@ -1,4 +1,4 @@ -package etcd; +package etcdserver; import "code.google.com/p/gogoprotobuf/gogoproto/gogo.proto"; diff --git a/etcd/v2_usage.go b/etcdserver/v2_usage.go similarity index 99% rename from etcd/v2_usage.go rename to etcdserver/v2_usage.go index ab96c0181..e11ea5911 100644 --- a/etcd/v2_usage.go +++ b/etcdserver/v2_usage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcdserver import ( "strings" diff --git a/etcd/version.go b/etcdserver/version.go similarity index 90% rename from etcd/version.go rename to etcdserver/version.go index 7b0f2dab1..79b450a1a 100644 --- a/etcd/version.go +++ b/etcdserver/version.go @@ -1,4 +1,4 @@ -package etcd +package etcdserver import ( "fmt" diff --git a/etcd/z_last_test.go b/etcdserver/z_last_test.go similarity index 99% rename from etcd/z_last_test.go rename to etcdserver/z_last_test.go index 655b10f23..6a7764d83 100644 --- a/etcd/z_last_test.go +++ b/etcdserver/z_last_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package etcd +package etcdserver import ( "net/http" diff --git a/main.go b/main.go index 7f9b26f63..2de8a1481 100644 --- a/main.go +++ b/main.go @@ -10,13 +10,13 @@ import ( "time" "github.com/coreos/etcd/conf" - "github.com/coreos/etcd/etcd" + "github.com/coreos/etcd/etcdserver" ) func main() { var cfg = conf.New() if err := cfg.Load(os.Args[1:]); err != nil { - fmt.Println(etcd.Usage() + "\n") + fmt.Println(etcdserver.Usage() + "\n") fmt.Println(err.Error(), "\n") os.Exit(1) } else if cfg.ShowVersion { @@ -26,7 +26,7 @@ func main() { os.Exit(0) } - e, err := etcd.New(cfg) + e, err := etcdserver.New(cfg) if err != nil { log.Fatal("etcd:", err) }