summaryrefslogtreecommitdiff
path: root/src/common/config_opts.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-19 12:41:54 -0700
committerSage Weil <sage@inktank.com>2013-08-19 12:41:54 -0700
commit68c1c70e1fdec7a916272695f2dcc27b0b65e9fc (patch)
tree4e9ffd6da0e8af00f2f08e4223034207bb67c0af /src/common/config_opts.h
parent9dda1cc0446c84d435d00d694f4fec4d7be755d3 (diff)
parent233fed8c9778b19cff149d641d83ab0ecebd245f (diff)
downloadceph-68c1c70e1fdec7a916272695f2dcc27b0b65e9fc.tar.gz
Merge remote-tracking branch 'gh/next'
Diffstat (limited to 'src/common/config_opts.h')
-rw-r--r--src/common/config_opts.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index f76dba15af2..d3e21105e79 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -30,6 +30,8 @@ OPTION(daemonize, OPT_BOOL, false) // default changed by common_preinit()
OPTION(pid_file, OPT_STR, "") // default changed by common_preinit()
OPTION(chdir, OPT_STR, "/")
OPTION(max_open_files, OPT_LONGLONG, 0)
+OPTION(restapi_log_level, OPT_STR, "") // default set by Python code
+OPTION(restapi_base_url, OPT_STR, "") // "
OPTION(fatal_signal_handlers, OPT_BOOL, true)
OPTION(log_file, OPT_STR, "/var/log/ceph/$cluster-$name.log") // default changed by common_preinit()