]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: rename omap_get_vals_by_key to omap_get_vals_by_keys
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 6 Mar 2012 22:53:38 +0000 (14:53 -0800)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 6 Mar 2012 22:53:38 +0000 (14:53 -0800)
merge fail

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
src/include/rados/librados.hpp

index 56fe400c4f56be76eee54c01c166b0a55f855269..a3d89600e84cdece3a231798356ee458ffdab5c5 100644 (file)
@@ -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);
   };