Ben Johnson 66115f95ca Merge branch 'master' of https://github.com/influxdb/influxdb into stateless-broker ... Conflicts: cmd/influxd/run.go messaging/broker.go messaging/client.go messaging/client_test.go messaging/intg_test.go server.go tx_test.go		2015-03-10 16:27:37 -06:00
..
influx	Fix for #1760: influx doesn't create $HOME/.influx_history	2015-03-03 17:12:19 -05:00
influxd	Merge branch 'master' of https://github.com/influxdb/influxdb into stateless-broker	2015-03-10 16:27:37 -06:00