diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-19 12:41:54 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-19 12:41:54 -0700 |
| commit | 68c1c70e1fdec7a916272695f2dcc27b0b65e9fc (patch) | |
| tree | 4e9ffd6da0e8af00f2f08e4223034207bb67c0af | |
| parent | 9dda1cc0446c84d435d00d694f4fec4d7be755d3 (diff) | |
| parent | 233fed8c9778b19cff149d641d83ab0ecebd245f (diff) | |
| download | ceph-68c1c70e1fdec7a916272695f2dcc27b0b65e9fc.tar.gz | |
Merge remote-tracking branch 'gh/next'
| -rw-r--r-- | doc/rados/configuration/auth-config-ref.rst | 8 | ||||
| -rw-r--r-- | doc/rados/configuration/filestore-config-ref.rst | 4 | ||||
| -rw-r--r-- | src/common/config_opts.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/doc/rados/configuration/auth-config-ref.rst b/doc/rados/configuration/auth-config-ref.rst index f38ad130ca3..c17d477b8fe 100644 --- a/doc/rados/configuration/auth-config-ref.rst +++ b/doc/rados/configuration/auth-config-ref.rst @@ -170,7 +170,7 @@ you can enable/disable signatures for service messages between the client and Ceph, and you can enable/disable signatures for messages between Ceph daemons. -``ceph require signatures`` +``cephx require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between the Ceph Client and the Ceph Storage Cluster, and @@ -181,7 +181,7 @@ Ceph, and you can enable/disable signatures for messages between Ceph daemons. :Default: ``false`` -``cepxh cluster require signatures`` +``cephx cluster require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between Ceph daemons comprising the Ceph Storage Cluster. @@ -191,7 +191,7 @@ Ceph, and you can enable/disable signatures for messages between Ceph daemons. :Default: ``false`` -``cepxh service require signatures`` +``cephx service require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between Ceph Clients and the Ceph Storage Cluster. @@ -226,4 +226,4 @@ Time to Live .. _Ceph Authentication & Authorization: ../../operations/auth-intro .. _Cephx Guide: ../../operations/authentication .. _Ceph Authentication: ../../operations/auth-intro#ceph-authentication-cephx -.. _Create an Admin Host: ../../deployment/ceph-deploy-admin#create-an-admin-host
\ No newline at end of file +.. _Create an Admin Host: ../../deployment/ceph-deploy-admin#create-an-admin-host diff --git a/doc/rados/configuration/filestore-config-ref.rst b/doc/rados/configuration/filestore-config-ref.rst index e207dfe7880..2e4a5b1a6fb 100644 --- a/doc/rados/configuration/filestore-config-ref.rst +++ b/doc/rados/configuration/filestore-config-ref.rst @@ -100,6 +100,7 @@ performance in some cases. :Required: No :Default: ``false`` +.. deprecated:: v.65 ``filestore flusher max fds`` @@ -108,6 +109,8 @@ performance in some cases. :Required: No :Default: ``512`` +.. deprecated:: v.65 + ``filestore sync flush`` :Description: Enables the synchronization flusher. @@ -115,6 +118,7 @@ performance in some cases. :Required: No :Default: ``false`` +.. deprecated:: v.65 ``filestore fsync flushes journal data`` 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() |