]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 03:58:15 +0000 (20:58 -0700)
committerSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 03:58:15 +0000 (20:58 -0700)
1  2 
src/mon/Monitor.cc
src/osd/PG.h

Simple merge
diff --cc src/osd/PG.h
Simple merge