]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/Makefile.am
src/librbd.cc
src/os/FileStore.cc

diff --cc src/Makefile.am
Simple merge
diff --cc src/librbd.cc
Simple merge
Simple merge