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

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

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dd63cdc 2697b30)

author	Jason Dillaman <dillaman@redhat.com>
	Thu, 14 Jan 2016 21:21:05 +0000 (16:21 -0500)
committer	Jason Dillaman <dillaman@redhat.com>
	Thu, 14 Jan 2016 21:21:05 +0000 (16:21 -0500)
commit	a290d34ebdfa571f62e69839ae0c3a9d11f075d1
tree	8f1697e919e7a707dae6c499a103dc76b347fd4d	tree \| snapshot
parent	dd63cdce717a2cf24a7f4ff7cb650182fd441275	commit \| diff
parent	2697b302bd5e28f172c6d87966a48c77665cde53	commit \| diff

Merge remote-tracking branch 'upstream/jewel'

19 files changed:

ceph.spec.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
src/common/WorkQueue.h	diff1 \|	diff2 \|	blob \| history
src/common/buffer.cc	diff1 \|	diff2 \|	blob \| history
src/common/ceph_context.cc	diff1 \|	diff2 \|	blob \| history
src/common/config.cc	diff1 \|	diff2 \|	blob \| history
src/common/lockdep.cc	diff1 \|	diff2 \|	blob \| history
src/common/perf_counters.cc	diff1 \|	diff2 \|	blob \| history
src/librados/RadosClient.cc	diff1 \|	diff2 \|	blob \| history
src/log/Log.cc	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history
src/msg/simple/Pipe.cc	diff1 \|	diff2 \|	blob \| history
src/msg/simple/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_notify.py	diff1 \|	diff2 \|	blob \| history
src/test/osd/TestPGLog.cc	diff1 \|	diff2 \|	blob \| history

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