Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: re-order ServerConfig fields

Browse Source
This commit is contained in:
Jonathan Boulle 2014-11-07 10:31:19 -08:00
parent c4f273478d
commit a607e097c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdmain/etcd.go
View File

@ -271,8 +271,8 @@ func startEtcd() error {
DiscoveryURL: *durl, DiscoveryURL: *durl,
DiscoveryProxy: *dproxy, DiscoveryProxy: *dproxy,
NewCluster: clusterStateFlag.String() == clusterStateFlagNew, NewCluster: clusterStateFlag.String() == clusterStateFlagNew,
Transport: pt,
ForceNewCluster: *forceNewCluster, ForceNewCluster: *forceNewCluster,
Transport: pt,
} }
var s *etcdserver.EtcdServer var s *etcdserver.EtcdServer
s, err = etcdserver.NewServer(cfg) s, err = etcdserver.NewServer(cfg)

2
etcdserver/config.go
View File

@ -35,8 +35,8 @@ type ServerConfig struct {
SnapCount uint64 SnapCount uint64
Cluster *Cluster Cluster *Cluster
NewCluster bool NewCluster bool
Transport *http.Transport
ForceNewCluster bool ForceNewCluster bool
Transport *http.Transport
} }
// VerifyBootstrapConfig sanity-checks the initial config and returns an error // VerifyBootstrapConfig sanity-checks the initial config and returns an error