Merge branch 'upstream_master' into issue-postfixldap
Conflicts: spec/classes/postfix_spec.rb
.sync/classes.md
0 → 100644
.sync/simple_usage.md
0 → 100644
CONTRIBUTING.md
0 → 100644
... | ... | @@ -2,8 +2,10 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" |
group :development, :unit_tests do | ||
gem 'rake', :require => false | ||
gem 'rspec-puppet', '~> 2.0', :require => false | ||
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1.8/ | ||
gem 'rspec-puppet', :require => false | ||
gem 'puppetlabs_spec_helper', :require => false | ||
gem 'metadata-json-lint', :require => false | ||
gem 'puppet-lint', :require => false | ||
gem 'puppet-lint-unquoted_string-check', :require => false | ||
gem 'puppet-lint-empty_string-check', :require => false | ||
... | ... | @@ -14,15 +16,12 @@ group :development, :unit_tests do |
gem 'puppet-lint-leading_zero-check', :require => false | ||
gem 'puppet-lint-trailing_comma-check', :require => false | ||
gem 'puppet-lint-file_ensure-check', :require => false | ||
gem 'simplecov', :require => false | ||
gem 'puppet-lint-version_comparison-check', :require => false | ||
gem 'rspec-puppet-facts', :require => false | ||
gem 'json', :require => false | ||
gem 'metadata-json-lint', :require => false | ||
gem 'docker-api', '1.15.0', :require => false | ||
end | ||
group :system_tests do | ||
gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack' | ||
gem 'beaker', :require => false | ||
gem 'beaker-rspec', :require => false | ||
gem 'serverspec', :require => false | ||
end | ||
... | ... |
Please register or sign in to comment