]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c83ab2 d6d5da1)
Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration
authorKefu Chai <tchaikov@gmail.com>
Mon, 6 Jun 2016 02:57:23 +0000 (10:57 +0800)
committerKefu Chai <tchaikov@gmail.com>
Mon, 6 Jun 2016 02:57:23 +0000 (10:57 +0800)
common/ceph_json.h: remove duplicate declaration

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.