]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next' of github.com:ceph/ceph into next
authorGary Lowell <gary.lowell@inktank.com>
Tue, 23 Jul 2013 06:21:33 +0000 (23:21 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 23 Jul 2013 06:21:33 +0000 (23:21 -0700)

Trivial merge