]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 21 Nov 2013 02:38:59 +0000 (18:38 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 21 Nov 2013 02:38:59 +0000 (18:38 -0800)

Trivial merge