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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 68d1d8e 0f82f46)

author	Sage Weil <sage@redhat.com>
	Thu, 27 Aug 2015 17:05:40 +0000 (13:05 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 27 Aug 2015 17:05:40 +0000 (13:05 -0400)
commit	cbe101e7db4265dfaeae3b85d5e7f266c6a1e9d5
tree	9a132e9b1ca2622d2fd869276bc4127bf9e1f9b3	tree \| snapshot
parent	68d1d8ee38d88b0c9d403f05a7aa0bbc3b0f20bd	commit \| diff
parent	0f82f461b33d93d868e185912a2c7e4074d06900	commit \| diff

Merge remote-tracking branch 'gh/wip-osd-compat'

Reviewed-by: Samuel Just <sjust@redhat.com>

src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.h	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.h	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history
src/os/Transaction.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	diff1 \|	diff2 \|	blob \| history

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