Merge branch 'master' of https://github.com/influxdb/influxdb into group-by

cmd/influxd/join_cluster.go

@@ -93,7 +93,7 @@ join-cluster creates a completely new node that will attempt to join an existing
                         'combined' means it will do both. The default is 'combined'. In role other than
                         these three is invalid.
 
-        -seedservers <servers>
+        -seed-servers <servers>
                         Set the list of servers the node should contact, to join the cluster. This
                         should be comma-delimited list of servers, in the form host:port. This option
                         is REQUIRED.

cmd/influxd/run.go

@@ -130,14 +130,14 @@ func execRun(args []string) {
 	// Start up HTTP server(s)
 	if config.ApiHTTPListenAddr() != config.RaftListenAddr() {
 		if serverHandler != nil {
-			func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), serverHandler)) }()
+			go func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), serverHandler)) }()
 		}
 		if brokerHandler != nil {
-			func() { log.Fatal(http.ListenAndServe(config.RaftListenAddr(), brokerHandler)) }()
+			go func() { log.Fatal(http.ListenAndServe(config.RaftListenAddr(), brokerHandler)) }()
 		}
 	} else {
 		h := NewHandler(brokerHandler, serverHandler)
-		func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), h)) }()
+		go func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), h)) }()
 	}
 
 	// Wait indefinitely.
@@ -157,7 +157,7 @@ use Distributed Consensus, but is otherwise fully-functional.
         -hostname <name>
                                 Override the hostname, the 'hostname' configuration option will be overridden.
 
-        -seedservers <servers>
+        -seed-servers <servers>
                                 If joining a cluster, overrides any previously configured or discovered
                                 Data node seed servers.
 

raft/log.go

@@ -377,7 +377,7 @@ func (l *Log) readConfig() (*Config, error) {
 	// Marshal file to a config type.
 	var config *Config
 	if f != nil {
-		config := &Config{}
+		config = &Config{}
 		if err := NewConfigDecoder(f).Decode(config); err != nil {
 			return nil, err
 		}