]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
committerSage Weil <sage@newdream.net>
Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
commitae58862b31f428d4a6e7707185f0127eaa487113
tree893eadb76b8c5f07ed06dfda50ef44d745210062
parent4e3003249cd86898e447e56c1f4fca787f7eb905
parent7d1179e656dbf5d6acb0f913363636ff242ac22d
Merge branch 'testing' into unstable
src/Makefile.am
src/cmon.cc
src/msg/SimpleMessenger.cc
src/os/FileJournal.cc