]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Tue, 7 May 2013 02:51:47 +0000 (19:51 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 7 May 2013 02:51:47 +0000 (19:51 -0700)
1  2 
ceph.spec.in

diff --cc ceph.spec.in
Simple merge