]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge commit 'origin/unstable' into rados
authorYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 7 Aug 2009 15:50:05 +0000 (08:50 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 7 Aug 2009 15:50:05 +0000 (08:50 -0700)
commit1fb90d367dc9141a6a87da412c9634406e469ff8
tree429f00b63e1d60c5bd455a5dbdf6120cd04fe4bf
parent779acd697f5b8c7bf5184853f50af09e2c9b6cb9
parent38daf9efae2ab00983b6c52c9b9e740cf2d94f31
Merge commit 'origin/unstable' into rados

Conflicts:

src/Makefile.am
src/Makefile.am
src/TODO
src/include/librados.h
src/librados.cc
src/mon/OSDMonitor.cc
src/osd/ReplicatedPG.cc