From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Jun 2018 18:00:20 +0000 (-0500)
Subject: Merge PR #22661 into master
X-Git-Tag: v14.0.1~1045
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37d20dfdc5d715b5cd185f19010c83e4a03fde27;p=ceph.git

Merge PR #22661 into master

* refs/pull/22661/head:
	mgr: remove unused [get|set]_store_json fns

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
---

37d20dfdc5d715b5cd185f19010c83e4a03fde27
diff --cc src/pybind/mgr/mgr_module.py
index 1064652cfc5d,5856836ae560..5ca8e2fe25fd
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@@ -622,35 -622,9 +622,13 @@@ class MgrModule(ceph_module.BaseMgrModu
          self._validate_option(key)
          return self._set_localized(key, val, self._set_config)
  
-     def set_store_json(self, key, val):
-         """
-         Helper for setting json-serialized stored data
- 
-         :param str key:
-         :param val: json-serializable object
-         """
-         self.set_store(key, json.dumps(val))
- 
-     def get_store_json(self, key):
-         """
-         Helper for getting json-serialized stored data
- 
-         :param str key:
-         :return: object
-         """
-         raw = self.get_store(key)
-         if raw is None:
-             return None
-         else:
-             return json.loads(raw)
- 
      def set_store(self, key, val):
          """
 -        Set a value in this module's persistent key value store
 +        Set a value in this module's persistent key value store.
 +        If val is None, remove key from store
 +
 +        :param str key:
 +        :param str val:
          """
          self._ceph_set_store(key, val)