]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Thu, 1 Nov 2012 00:14:44 +0000 (17:14 -0700)
committerSage Weil <sage@inktank.com>
Thu, 1 Nov 2012 00:14:44 +0000 (17:14 -0700)
1  2 
src/mon/Monitor.cc
src/osd/osd_types.cc
src/osd/osd_types.h

Simple merge
Simple merge
Simple merge