]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Wed, 8 Aug 2012 20:05:12 +0000 (13:05 -0700)
committerSage Weil <sage@inktank.com>
Wed, 8 Aug 2012 20:05:12 +0000 (13:05 -0700)

Trivial merge