Merge pull request #14723 from neha-ojha/objclass-sdk

author Yuri Weinstein <yuri.weinstein@gmail.com>

Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)

committer GitHub <noreply@github.com>

Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)
committer GitHub <noreply@github.com>
Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history