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

..

fixtures

Add v1.solo migration fixture.

2013-11-04 13:56:02 -07:00

functional

fix tests bump deps

2013-12-01 17:24:30 -05:00

mock

fix(server/v2): redirect to ClientURL not PeerURL

2013-12-02 18:20:11 -08:00

http_utils.go

Renamed configuration parameters.

2013-11-15 00:13:32 -05:00

server_utils.go

Merge remote-tracking branch 'upstream/master' into feature-parametric-timeout

2013-12-06 10:13:33 +00:00