From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 6 Jun 2016 02:57:23 +0000 (+0800)
Subject: Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration
X-Git-Tag: v11.0.0~317
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e5a0186a1bb775844a1b4c2065f409b887de773;p=ceph.git

Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration

common/ceph_json.h: remove duplicate declaration

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

4e5a0186a1bb775844a1b4c2065f409b887de773