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: e85ffac 882672d)

author	Sage Weil <sage@redhat.com>
	Wed, 3 Feb 2016 13:48:26 +0000 (08:48 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 3 Feb 2016 13:48:26 +0000 (08:48 -0500)
commit	9a80477432730632941a005fa24739ff301a4cb6
tree	d243a93a3741cd65e6cdbbc4b1d658961228db3f	tree \| snapshot
parent	e85ffacb281be20c57a48ea7c175c7fddb1fcc3e	commit \| diff
parent	882672dcfa2fcde48a8b1ebea04ff433c9c6b870	commit \| diff

Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph

Reviewed-by: Kefu Chai <kchai@redhat.com>

configure.ac	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/Makefile-env.am	diff1 \|	diff2 \|	blob \| history
src/common/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/common/ceph_context.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/log/Log.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history

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