Commit Graph

8 Commits (022908f1fa955f3c4eb6ab36edcc4dbff5248c7d)

Author SHA1 Message Date
Erik d3fb9f0f0f etcd is in the bin directory, fixes bug with the docker image not working 2014-01-15 12:46:09 -05:00
Jérôme Petazzoni 6b14fe7747 Download and build Go 1.2 in the Dockerfile.
The dependency BurntSushi/toml actually needs Go 1.2, because it uses
encoding.TextUnmarshaler, which didn't exist in Go 1.1. Since the PPA
that we use doesn't have Go 1.2 yet, we will use the same method as
Docker, i.e. download Go source tarball and compile it.
2014-01-14 18:19:37 -08:00
Neil Dunbar a06f5e74af Merge remote-tracking branch 'upstream/master' into feature-parametric-timeout
Conflicts:
	Dockerfile
	server/usage.go
	tests/server_utils.go
2013-12-06 10:13:33 +00:00
Alex Polvi b22c6fed4d fix(Dockerfile): remove bogus -bind-addr, and use default -addr 2013-12-05 18:07:51 +00:00
Neil Dunbar 0867b33de5 fix(Dockerfile): reverted unneeded changes
fix(server/config.go): ensured params are changeable from config file and env
fix(server/server.go): removed unnecessary debug line
fix(server/timeout.go): removed a commented block
style(server/transporter.go): put explicit vars to replace timeout expressions
style(tests/server_utils.go): ran gofmt to clean up indenting
2013-12-05 09:23:23 +00:00
Neil Dunbar 46f8a354d1 Added the ability to specify heartbeat and election timeouts as
config parameters.
2013-12-04 16:58:44 +00:00
Ben Johnson cba2611c68 Renamed configuration parameters. 2013-11-15 00:13:32 -05:00
Zef Hemel 9ede78d75f Added dockerfile 2013-08-15 10:00:37 +02:00