*: rename etcd to etcdserver

etcd/discovery.go → 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"

etcd/etcd.go → 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"

etcd/etcd_functional_test.go → 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"

etcd/etcd_start_test.go → 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"

etcd/etcd_test.go → 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"

etcd/package_stats.go → etcdserver/package_stats.go

@@ -1,4 +1,4 @@
-package etcd
+package etcdserver
 
 import (
 	"time"

etcd/participant.go → 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"

etcd/peer.go → 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"

etcd/peer_hub.go → 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"

etcd/raft_follower_stats.go → etcdserver/raft_follower_stats.go

@@ -1,4 +1,4 @@
-package etcd
+package etcdserver
 
 import (
 	"math"

etcd/raft_handler.go → 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"

etcd/raft_server_stats.go → etcdserver/raft_server_stats.go

@@ -1,4 +1,4 @@
-package etcd
+package etcdserver
 
 import (
 	"sync"

etcd/standby.go → 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"

etcd/stats_queue.go → etcdserver/stats_queue.go

@@ -1,4 +1,4 @@
-package etcd
+package etcdserver
 
 import (
 	"sync"

etcd/v2_admin.go → 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"

etcd/v2_apply.go → 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"

etcd/v2_client.go → 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"

etcd/v2_http.go → 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"

etcd/v2_http_delete.go → 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"

etcd/v2_http_endpoint_test.go → 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"

etcd/v2_http_get.go → 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"

etcd/v2_http_kv_test.go → 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"

etcd/v2_http_post.go → 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"

etcd/v2_http_put.go → 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"

etcd/v2_raft.go → 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"

etcd/v2_store.go → 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"

etcd/v2_store_cmd.pb.go → 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"

etcd/v2_store_cmd.proto → etcdserver/v2_store_cmd.proto

@@ -1,4 +1,4 @@
-package etcd;
+package etcdserver;
 
 import "code.google.com/p/gogoprotobuf/gogoproto/gogo.proto";
 

etcd/v2_usage.go → 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"

etcd/version.go → etcdserver/version.go

@@ -1,4 +1,4 @@
-package etcd
+package etcdserver
 
 import (
 	"fmt"

etcd/z_last_test.go → 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"

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)
 	}