Merge branch 'master' into cluster-resize

This commit is contained in:
Travis Turner 2018-02-06 13:07:55 -06:00
commit 1312ddf9a2
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9

View file

@ -23,7 +23,7 @@ Pilosa uses GNU/POSIX style flags. Most flags you specify as `--flagname=value`
### Environment variables
Every command line flag has a corresponding environment variable. The environment variable is the flag name in all caps, prefxed by `PILOSA_`, and with any dashes replaced by underscores. For example: `--flag-name` becomes `PILOSA_FLAG_NAME`.
Every command line flag has a corresponding environment variable. The environment variable is the flag name in all caps, prefixed by `PILOSA_`, and with dots and dashes replaced by underscores. For example: `--scope.flag-name` becomes `PILOSA_SCOPE_FLAG_NAME`.
### Config file