Ben Johnson 62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy ...

Conflicts:
	config/config.go
	server/peer_server.go
	server/transporter.go
	tests/server_utils.go

2014-03-24 15:30:14 -07:00

..

v1

Merge branch 'master' of https://github.com/coreos/etcd into proxy

2014-03-24 15:30:14 -07:00

v2

Merge branch 'master' of https://github.com/coreos/etcd into proxy

2014-03-24 15:30:14 -07:00

cluster_config.go

Add minimum active size and promote delay.

2014-03-10 14:44:04 -06:00

demote_command.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

join_command.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

listener.go

refactor(listener) refactor listener related code

2014-03-13 15:47:27 -07:00

package_stats.go

Refactor commands.

2013-10-11 01:02:38 -06:00

peer_server_handlers.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

peer_server.go

Merge branch 'master' of https://github.com/coreos/etcd into proxy

2014-03-24 15:30:14 -07:00

raft_follower_stats.go

refactor(raft): init raft transporter & server in main

2014-01-22 11:17:56 -08:00

raft_server_stats.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

registry.go

Machine join/remove v2 API.

2014-03-18 16:25:21 -06:00

release_version.go

fix(etcd): get consistent with etcdctl on printing versions

2014-02-13 07:54:44 -08:00

remove_command.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

server.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

set_cluster_config_command.go

bump(github.com/goraft/raft): 6bf34b9

2014-03-24 15:09:47 -07:00

stats_queue.go

Refactored.

2013-10-12 15:56:43 -06:00

tls_info.go

fix(server/tls_info): use all certificates in CA file

2014-02-10 22:31:22 -08:00

transporter_test.go

chore(*.go): add copyright notice

2013-11-08 14:04:15 -08:00

transporter.go

Merge branch 'master' of https://github.com/coreos/etcd into proxy

2014-03-24 15:30:14 -07:00

usage.go

chore: rename 'heartbeat timeout' to 'heartbeat interval'

2014-02-18 16:37:20 -08:00

version.go

Internal versioning.

2013-10-27 14:09:40 -06:00