]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/stable'
authorSage Weil <sage@newdream.net>
Thu, 19 May 2011 22:04:19 +0000 (15:04 -0700)
committerSage Weil <sage@newdream.net>
Thu, 19 May 2011 22:04:19 +0000 (15:04 -0700)
1  2 
src/client/Client.cc
src/osdc/Journaler.cc

Simple merge
Simple merge