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
(parent: 539c675) | patch

author	Sage Weil <sage@redhat.com>
	Fri, 16 Feb 2018 04:43:18 +0000 (22:43 -0600)
committer	Sage Weil <sage@redhat.com>
	Fri, 7 Sep 2018 17:07:56 +0000 (12:07 -0500)
commit	ad3aab364b83d33ba50161c6b929a15f03633334
tree	20d967d567e6401d45af7cb9a8dfc7a7620e00b5	tree \| snapshot
parent	539c675db9de1e06f204edac462e17c0b1f7568b	commit \| diff

os/ObjectStore: add merge_collection operation to Transaction

Signed-off-by: Sage Weil <sage@redhat.com>

src/os/ObjectStore.h		diff \| blob \| history
src/os/Transaction.cc		diff \| blob \| history

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