]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sun, 25 Nov 2012 17:18:44 +0000 (09:18 -0800)
committerSage Weil <sage@inktank.com>
Sun, 25 Nov 2012 17:18:44 +0000 (09:18 -0800)

Trivial merge