Merge pull request #6902 from XinzeChi/wip-pg_stat_t-encoding

author Sage Weil <sage@redhat.com>

Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)
author Sage Weil <sage@redhat.com>
Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)
		1	2
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history