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: b17c3eb 9b4b350)

author	Sage Weil <sage@redhat.com>
	Tue, 10 Mar 2015 13:24:59 +0000 (06:24 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 10 Mar 2015 13:24:59 +0000 (06:24 -0700)
commit	faa1f2741c0f287af5909e95bf202da3778092da
tree	f9372fec5bf5bfcc2263a6da120f86ad222a205b	tree \| snapshot
parent	b17c3ebbdc0ae097db9c088e1821d0de493f9eee	commit \| diff
parent	9b4b35069570196b770bc6afb0f1f547b68d9635	commit \| diff

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

doc/man/8/rbd.rst	diff1 \|	diff2 \|	blob \| history
qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/test/encoding/types.h	diff1 \|	diff2 \|	blob \| history
src/tools/crushtool.cc	diff1 \|	diff2 \|	blob \| history

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