]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-7888-dumpling' into dumpling
authorSage Weil <sage@inktank.com>
Wed, 2 Apr 2014 19:57:30 +0000 (12:57 -0700)
committerSage Weil <sage@inktank.com>
Wed, 2 Apr 2014 19:57:30 +0000 (12:57 -0700)

Trivial merge