Merge "Remove use of deprecated include_class matcher" into stable/havana

author Jenkins <jenkins@review.openstack.org>

Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)
diff --cc spec/classes/ceilometer_agent_compute_spec.rb
Simple merge
diff --cc spec/classes/ceilometer_api_spec.rb
Simple merge
diff --cc spec/classes/ceilometer_init_spec.rb
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 15 Jan 2014 05:56:26 +0000 (05:56 +0000)
		1	2
spec/classes/ceilometer_agent_compute_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/classes/ceilometer_api_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/classes/ceilometer_init_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history