Merge branch 'master' of github.com:/prometheus/prometheus

This commit is contained in:
Julius Volz 2013-03-25 12:15:42 +01:00
commit 5d4a090987

View file

@ -27,7 +27,7 @@ import (
// Commandline flags. // Commandline flags.
var ( var (
listenAddress = flag.String("listenAddress", ":9090", "Address to listen on for web interface.") listenAddress = flag.String("listenAddress", ":9090", "Address to listen on for web interface.")
useLocalAssets = flag.Bool("localAssets", false, "Read assets/templates from file instead of binary.") useLocalAssets = flag.Bool("useLocalAssets", false, "Read assets/templates from file instead of binary.")
) )
func StartServing(appState *appstate.ApplicationState) { func StartServing(appState *appstate.ApplicationState) {