]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' into msgr
authorSage Weil <sage@newdream.net>
Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
committerSage Weil <sage@newdream.net>
Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
1  2 
src/client/Client.cc
src/mds/Server.cc

Simple merge
Simple merge