From 2b858cd4ac8eb9721a0cb5cfd5d38f7d54073315 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@enovance.com>
Date: Tue, 3 Feb 2015 15:32:20 +0100
Subject: [PATCH] spec: pin rspec-puppet to 1.0.1

rspec-puppet (2.0.0) was released yesterday[1], this new version broke
puppet-openstack unit tests (undefined method `resource')[2] as talked on
and in a second time to update your specs to 2.0.0 and rspec 3.x`)

[1] https://github.com/rodjek/rspec-puppet/commit/8459e14807977244c00bdbcf190062c529b63474
[2] http://logs.openstack.org/45/105245/6/check/gate-puppet-nova-puppet-unit-3.3/3682541/console.html

Conflicts:
	Gemfile

Change-Id: I1ceae5bc5232d859a11c87a567a2456acf3c8be8
Partial-bug: #1417604
(cherry picked from commit 155017859ac4fedc3ca3778a4a4024166a3c09a7)
---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index d965fa90..f3182fde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'puppet-lint', '~> 0.3.2'
+  gem 'rspec-puppet', '~> 1.0.1'
   gem 'rake', '10.1.1'
   gem 'rspec', '< 2.99'
   gem 'json'