From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Tue, 6 Mar 2012 22:53:38 +0000 (-0800)
Subject: librados: rename omap_get_vals_by_key to omap_get_vals_by_keys
X-Git-Tag: v0.44~45^2^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7012c20be9fc7fb40cd913ddda527ad38d4bc6c4;p=ceph.git

librados: rename omap_get_vals_by_key to omap_get_vals_by_keys

merge fail

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
---

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 56fe400c4f56b..a3d89600e84cd 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -267,9 +267,9 @@ namespace librados
      * @param out_vals [out] place key/value pairs found here on completion
      * @param prval [out] place error code in prval upon completion
      */
-    void omap_get_vals_by_key(const std::set<std::string> &keys,
-			      std::map<std::string, bufferlist> *map,
-			      int *prval);
+    void omap_get_vals_by_keys(const std::set<std::string> &keys,
+			       std::map<std::string, bufferlist> *map,
+			       int *prval);
   };