]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Tue, 21 Sep 2010 20:54:57 +0000 (13:54 -0700)
committerSage Weil <sage@newdream.net>
Tue, 21 Sep 2010 20:54:57 +0000 (13:54 -0700)
commit136aa978e21471a80fb5c7d15bf0371c4580ad4c
tree9512905b1b97b6f591c659e517403f3ab84e86f3
parentf080bb96756c067415d8ba9fa47042ffb451b37c
parentb7c4185793ebe8372b6d50b3373cea71b77a824f
Merge branch 'testing' into unstable

Conflicts:
src/mds/MDCache.cc
src/mds/MDCache.cc
src/mds/MDCache.h