Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock

diff --cc src/mon/LogMonitor.cc
Simple merge

diff --cc src/osd/PGLog.cc
Simple merge

diff --cc src/osd/PGLog.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge