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: 405003b 4347a32)

author	Sage Weil <sage@redhat.com>
	Mon, 6 Apr 2015 20:43:01 +0000 (13:43 -0700)
committer	Sage Weil <sage@redhat.com>
	Mon, 6 Apr 2015 20:43:01 +0000 (13:43 -0700)
commit	1594daecc6edcc32da780f6618af7820aa9ecad8
tree	cb0b11764c47b51cbcac8a1f29cc8d1ea6a05d0b	tree \| snapshot
parent	405003b3132166a6a29aa776c71b05431cf390eb	commit \| diff
parent	4347a3207d5d022c12a7388a89b54ca4e0651aba	commit \| diff

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

src/mon/LogMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	diff1 \|	diff2 \|	blob \| history

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