Merge pull request #2979 from ceph/wip-kill-category

osd: kill 'category' from pg_stats_t

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc PendingReleaseNotes
Simple merge

diff --cc src/include/rados/librados.h
index 0c983ef18cf536544164b16bc3678de3e7cfe736,60faa94986a953f137bce6f50aa3fba851d534e9..9c4a5732ff69613b975f3cc555d7eb30422f0a3b
--- 1/src/include/rados/librados.h
--- 2/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@@ -2067,10 -1993,11 +2067,11 @@@ CEPH_RADOS_API void rados_write_op_rmxa
   * @param exclusive set to either LIBRADOS_CREATE_EXCLUSIVE or
     LIBRADOS_CREATE_IDEMPOTENT
   * will error if the object already exists.
+  * @param category category string (DEPRECATED, HAS NO EFFECT)
   */
 -void rados_write_op_create(rados_write_op_t write_op,
 -                           int exclusive,
 -                           const char* category);
 +CEPH_RADOS_API void rados_write_op_create(rados_write_op_t write_op,
 +                                          int exclusive,
 +                                          const char* category);
  
  /**
   * Write to offset

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge