]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit8549fc9afb2b1e638f69684b4c936b6f65f443e1
tree918494bb76e3e4c75af7b07ebb1f975daeec2b6e
parent57f423ba696b3dbc2cfcd29a7682097649450cbe
parentf16903d724150ce7ec6886972a1726509bdcb828
Merge remote branch 'origin/stable'
src/client/Client.cc
src/osdc/Journaler.cc