4 Commits

Author SHA1 Message Date
Ben Johnson
41e7266ff7 Merge branch '0.2' into config
Conflicts:
	Documentation/external-documentation.md
	server/config.go
	server/config_test.go
	server/tls_info.go
	server/util.go
2013-10-23 13:59:28 -06:00
Ben Johnson
f99d24310f Fix conf extension and documentation. 2013-10-23 13:44:53 -06:00
Ben Johnson
bc0e07bca2 Add tiered configuration. 2013-10-21 21:37:25 -06:00
Ben Johnson
48b3e7f2ab Add basic config. 2013-10-21 16:00:20 -06:00