]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed50d14 8877ee4)
Merge pull request #12741 from SUSE/wip-18320-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Mon, 30 Jan 2017 12:24:22 +0000 (13:24 +0100)
committerGitHub <noreply@github.com>
Mon, 30 Jan 2017 12:24:22 +0000 (13:24 +0100)
jewel: rbd status: json format has duplicated/overwritten key

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/tools/rbd/action/Status.cc patch | diff1 | diff2 | blob | history

diff --cc src/tools/rbd/action/Status.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.