]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/master' into wip-backfill
authorSage Weil <sage@newdream.net>
Sat, 7 Jan 2012 00:44:11 +0000 (16:44 -0800)
committerSage Weil <sage@newdream.net>
Sat, 7 Jan 2012 00:44:11 +0000 (16:44 -0800)
1  2 
src/mon/Monitor.h
src/msg/SimpleMessenger.cc

Simple merge
Simple merge