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: b0aa846 b22d693)

author	Sage Weil <sage@redhat.com>
	Thu, 21 Aug 2014 20:14:51 +0000 (13:14 -0700)
committer	Sage Weil <sage@redhat.com>
	Thu, 21 Aug 2014 20:14:51 +0000 (13:14 -0700)
commit	5b9ade5058f72116eb3dc920f442361c2a33b46b
tree	b9816a5395d19b3797a8e921a1828c84631e5341	tree \| snapshot
parent	b0aa846b3f81225a779de00100e15334fb8156b3	commit \| diff
parent	b22d693f6814f9337e866d3200d7beffa69d00b4	commit \| diff

Merge pull request #2253 from adamcrume/wip-lttng

RBD-replay

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

18 files changed:

ceph.spec.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
src/Makefile-env.am	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OpRequest.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OpRequest.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	diff1 \|	diff2 \|	blob \| history

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