Merge branch 'master' into collectd

pull/1298/head
Cory LaNou 2015-01-09 10:44:28 -07:00
commit 3fd1fe2210
1 changed files with 2 additions and 2 deletions

View File

@ -35,8 +35,8 @@ port = 8083 # binding is disabled if the port isn't set
# Configure the http api
[api]
port = 8086 # binding is disabled if the node is not a Data node.
# ssl-port = 8084 # Ssl support is enabled if you set a port and cert
# ssl-cert = /path/to/cert.pem
# ssl-port = 8084 # SSL support is enabled if you set a port and cert
# ssl-cert = "/path/to/cert.pem"
# connections will timeout after this amount of time. Ensures that clients that misbehave
# and keep alive connections they don't use won't end up connection a million times.