From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 22 Feb 2019 18:28:19 +0000 (-0500)
Subject: rgw: make beast the default for rgw_frontends
X-Git-Tag: v14.2.0~55^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26599%2Fhead;p=ceph.git

rgw: make beast the default for rgw_frontends

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index 44256462d94d8..37bb8eea9007e 100644
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -22,7 +22,7 @@ instances or all radosgw-admin commands can be put into the ``[global]`` or the
               `HTTP Frontends`_ for more on supported options.
 
 :Type: String
-:Default: ``civetweb port=7480``
+:Default: ``beast port=7480``
 
 ``rgw data``
 
diff --git a/src/common/options.cc b/src/common/options.cc
index 07345d8f14696..528682611a154 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6383,7 +6383,7 @@ std::vector<Option> get_rgw_options() {
         "contain the name of the bucket the operation happened on."),
 
     Option("rgw_frontends", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("civetweb port=7480")
+    .set_default("beast port=7480")
     .set_description("RGW frontends configuration")
     .set_long_description(
         "A comma delimited list of frontends configuration. Each configuration contains "