Merge remote-tracking branch 'immerda/master' into merge_immerda

Conflicts:
	manifests/plugins/interfaces.pp

$real_ifs was changed on master and we'd like to keep that change

$ifs was changed to use the prefix() function and we'd like to keep that
change.

1 files changed, 21 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..a6b52f0
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+if ENV.key?('PUPPET_VERSION')
+  puppetversion = "~> #{ENV['PUPPET_VERSION']}"
+else
+  puppetversion = ['>= 2.6']
+end
+
+if RUBY_VERSION == '1.8.7'
+  gem 'activesupport', '~> 3.2'
+  gem 'librarian-puppet', '~> 1.0.0'
+else
+  gem 'librarian-puppet', '>=0.9.10'
+end
+gem 'puppet',  puppetversion
+gem 'puppet-lint', '>=0.3.2'
+gem 'puppetlabs_spec_helper', '>=0.2.0'
+gem 'rake',         '>=0.9.2.2'
+gem 'rspec-system-puppet',     :require => false
+gem 'serverspec',              :require => false
+gem 'rspec-system-serverspec', :require => false