]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sun, 20 Oct 2013 04:01:28 +0000 (21:01 -0700)
committerSage Weil <sage@inktank.com>
Sun, 20 Oct 2013 04:01:28 +0000 (21:01 -0700)

Trivial merge