]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/stable'
authorSage Weil <sage.weil@dreamhost.com>
Sat, 11 Jun 2011 00:37:29 +0000 (17:37 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sat, 11 Jun 2011 00:37:29 +0000 (17:37 -0700)
commit83a55f4dc79065d411c1bff2bf549c78df24526d
tree027ec13a0572054d21522e39750fe813115cc1f3
parent78012fde6f02945cc1d3ec626f671803c806c170
parent01df7c667ec61d5ececa4993ab0b119ee5a11334
Merge remote branch 'origin/stable'

Conflicts:
src/dumpjournal.cc
configure.ac
src/Makefile.am
src/crushtool.cc
src/mon/OSDMonitor.cc
src/msg/SimpleMessenger.cc
src/msg/SimpleMessenger.h
src/os/FileStore.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc