git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2325a1a af96ba5)

author	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 22:23:12 +0000 (14:23 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 22:23:12 +0000 (14:23 -0800)
commit	53b076d5fb4dd840cc0a18c25466755b3824930b
tree	18ad4756ed3dae313e4e991d5333390992ce690f	tree \| snapshot
parent	2325a1a27b434cea7d7af832efff7a9257724fe6	commit \| diff
parent	af96ba53fac358c88afdee1b50fb3cbb897f440b	commit \| diff

Merge remote branch 'origin/rbd-fiemap' into unstable

12 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/include/ceph_strings.cc	diff1 \|	diff2 \|	blob \| history
src/include/librados.hpp	diff1 \|	diff2 \|	blob \| history
src/librados.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.h	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history
src/rados.cc	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.