librados: bump minor version number

rados_create_internal -> rados_create_with_config

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index e1a248352bf99bd50d05ef384863bd37175386f4..0844ff6818ad49ab5d67f2a4b9a17b9678233e34 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 #define LIBRADOS_VER_MAJOR 0
-#define LIBRADOS_VER_MINOR 26
+#define LIBRADOS_VER_MINOR 27
 #define LIBRADOS_VER_EXTRA 0
 
 #define LIBRADOS_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
@@ -54,8 +54,8 @@ void rados_version(int *major, int *minor, int *extra);
 /* initialization */
 int rados_create(rados_t *cluster, const char * const id);
 
-/* internal API for creating rados clusters */
-int rados_create_internal(rados_t *cluster, struct md_config_t *conf);
+/* initialize rados with an existing configuration. */
+int rados_create_with_config(rados_t *cluster, struct md_config_t *conf);
 
 /* Connect to the cluster */
 int rados_connect(rados_t cluster);

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 9c2d854eda8795a198a885b74985645be12cb552..029648f35ec1099e7fa59faebe595b69d690a1b7 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -211,7 +211,7 @@ namespace librados
     ~Rados();
 
     int init(const char * const id);
-    int init_internal(md_config_t * conf);
+    int init_with_config(md_config_t * conf);
     int connect();
     void shutdown();
     int conf_read_file(const char * const path) const;

diff --git a/src/librados.cc b/src/librados.cc
index 9d5dafb371a89cf5e2af221ddc182853a3715c3d..db32a4a433fa7f4c9dab829fb699ae59a2fcead4 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2437,9 +2437,9 @@ init(const char * const id)
 }
 
 int librados::Rados::
-init_internal(md_config_t *conf)
+init_with_config(md_config_t *conf)
 {
-  return rados_create_internal((rados_t *)&client, conf);
+  return rados_create_with_config((rados_t *)&client, conf);
 }
 
 int librados::Rados::
@@ -2620,7 +2620,7 @@ extern "C" int rados_create(rados_t *pcluster, const char * const id)
  * already called common_init and want to use that particular configuration for
  * their cluster.
  */
-extern "C" int rados_create_internal(rados_t *pcluster, md_config_t *conf)
+extern "C" int rados_create_with_config(rados_t *pcluster, md_config_t *conf)
 {
   rados_init_mutex.Lock();
   if (!rados_initialized) {

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index c038cafd39fe18cc2379924e020f3b9b76b25135..dae57fc4fdbf5a2626dbf7e5a6a7d6718584870e 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -33,7 +33,7 @@ int RGWRados::initialize(md_config_t *conf)
   if (!rados)
     return -ENOMEM;
 
-  ret = rados->init_internal(conf);
+  ret = rados->init_with_config(conf);
   if (ret < 0)
    return ret;