]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1210 from dachary/dumpling
authorSage Weil <sage@inktank.com>
Tue, 11 Feb 2014 16:32:37 +0000 (08:32 -0800)
committerSage Weil <sage@inktank.com>
Tue, 11 Feb 2014 16:32:37 +0000 (08:32 -0800)
commit4889234f80dbd95e5b2012ff9bfc2d87960034e2
tree292786ceb10e686ef7620fca3574cbfbf648b3ac
parent6af657bd4cf87f6f7afe84257941e7e2366183d9
parent30a604d2d6a5de7bcbfa0136e9a766cb34f96c0a
Merge pull request #1210 from dachary/dumpling

common: admin socket fallback to json-pretty format (dumpling)

Reviewed-by: Sage Weil <sage@inktank.com>
src/client/Client.cc
src/osdc/Objecter.cc