Merge pull request #2124 from ceph/wip-objectstore

author Sage Weil <sage@redhat.com>

Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)

committer Sage Weil <sage@redhat.com>

Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)
author Sage Weil <sage@redhat.com>
Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)
committer Sage Weil <sage@redhat.com>
Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)
diff --cc src/.gitignore
Simple merge
diff --cc src/os/KeyValueStore.cc
Simple merge
diff --cc src/os/KeyValueStore.h
Simple merge
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)
committer	Sage Weil <sage@redhat.com>
	Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)
		1	2
src/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history