]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/cuttlefish-next' into cuttlefish
authorSage Weil <sage@inktank.com>
Thu, 25 Jul 2013 22:21:31 +0000 (15:21 -0700)
committerSage Weil <sage@inktank.com>
Thu, 25 Jul 2013 22:21:31 +0000 (15:21 -0700)

Trivial merge