]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' into wip-discard
authorSage Weil <sage.weil@dreamhost.com>
Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
commitbe438d6e4e1ced8365b772ff97976e053cbb29ac
tree70043326cb79afa5d0cb8e969f9619a05dc90da2
parent97f507ffb7e2818c5355f5f275df5f16e1df250a
parentfb9fdf45b08aac50928d311832fd23a86c9b5f89
Merge branch 'master' into wip-discard
src/Makefile.am
src/librbd.cc
src/os/FileStore.cc