Commit Graph

809 Commits (54e116507fe73561f1d74929af5fbf3049bf2dcc)

Author SHA1 Message Date
Philip O'Toole 1ae7905434 Remove no-longer-used config params 2014-11-18 20:53:29 -08:00
Ben Johnson f5954ace5e Move version and commit sha into main.go. 2014-11-17 17:34:47 -07:00
Ben Johnson 37ee2ac23c Remove engine, parser, and Makefile. 2014-11-17 15:54:35 -07:00
Ben Johnson 2c7f879f4d Integrating http handler. 2014-11-10 22:25:03 -07:00
Ben Johnson 9d1464813a Merge branch 'master' of https://github.com/influxdb/influxdb into streaming-raft
Conflicts:
	Makefile.in
	_vendor/raft/server.go
	_vendor/raft/snapshot.go
	_vendor/raft/snapshot_test.go
	admin/http_server.go
	admin/http_server_test.go
	api/graphite/api.go
	api/http/series_writer.go
	cluster/cluster_configuration.go
	cluster/cluster_server.go
	cluster/nil_processor.go
	cluster/shard_space.go
	cmd/influxd/main.go
	common/helpers.go
	configuration/configuration.go
	configuration/configuration_test.go
	coordinator/protobuf_server.go
	coordinator/raft_server.go
	datastore/point_iterator.go
	datastore/shard.go
	datastore/storage_key.go
	engine/aggregator_engine.go
	engine/arithmetic_operators.go
	parser/group_by.go
	parser/query_api.go
	response_channel.go
	server/server.go
2014-11-06 01:20:36 -05:00
Ben Johnson 7db0e15799 Refactoring into root. 2014-10-21 23:32:19 -06:00
Ben Johnson bee1842ed8 Move api/graphite to root. 2014-10-21 18:20:43 -06:00
Ben Johnson 2d85507a87 Refactor tools into cmd. 2014-10-21 17:46:16 -06:00
Ben Johnson ccb0e6b6a1 Refactor configuration into main. 2014-10-20 23:32:47 -06:00