Merge pull request #9524 from liewegas/wip-ctz

author Sage Weil <sage@redhat.com>

Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)

committer GitHub <noreply@github.com>

Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)
author Sage Weil <sage@redhat.com>
Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)
committer GitHub <noreply@github.com>
Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
diff --cc src/test/Makefile-client.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)
committer	GitHub <noreply@github.com>
	Wed, 15 Jun 2016 19:14:30 +0000 (15:14 -0400)
		1	2
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile-client.am	patch \|	diff1 \|	diff2 \|	blob \| history