[etcd/f21] default to /var/lib/etcd/default.etcd as 2.0 uses that default

[Eric Paris]

commit a2559fc1b73fee43ae02142c44b8d04a333df404
Author: Eric Paris <eparis at redhat.com>
Date:   Wed Jan 21 16:42:40 2015 -0500

    default to /var/lib/etcd/default.etcd as 2.0 uses that default

 .gitignore |    1 +
 etcd.conf  |    4 ++--
 etcd.spec  |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e194d9d..be5ca1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+/clog
 /etcd-0.4.6.tar.gz
diff --git a/etcd.conf b/etcd.conf
index 1b43f65..4d5d50e 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -6,7 +6,7 @@
 # cert_file = ""
 # cors = []
 # cpu_profile_file = ""
-# data_dir = "."
+data_dir = "/var/lib/etcd/default.etcd"
 # discovery = "http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster"
 # http_read_timeout = 10
 # http_write_timeout = 10
@@ -16,7 +16,7 @@
 # max_cluster_size = 9
 # max_result_buffer = 1024
 # max_retry_attempts = 3
-# name = "default-name"
+name = "default"
 # snapshot = false
 # verbose = false
 # very_verbose = false
diff --git a/etcd.spec b/etcd.spec
index 197715b..341ff6a 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -4,7 +4,7 @@
 
 Name:		etcd
 Version:	0.4.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A highly-available key value store for shared configuration
 
 License:	ASL 2.0
@@ -128,6 +128,9 @@ getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etc
 %{gopath}/src/%{import_path}/*
 
 %changelog
+* Wed Jan 21 2014 Eric Paris <eparis at redhat.com> - 0.4.6-7
+- default to /var/lib/etcd/default.etcd as 2.0 uses that default
+
 * Mon Oct 06 2014 jchaloup <jchaloup at redhat.com> - 0.4.6-6
 - related: #1047194
   Remove dependency on go.net