Skip to content

Updated CHANGELOG and fixing broken tests #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ rvm:
- 2.0.0
bundler_args: --without system_tests
env:
matrix:
- PUPPET_VERSION=4.4.1
- PUPPET_VERSION=3.7.3
- PUPPET_VERSION=3.6.0
- PUPPET_VERSION=3.5.0
- PUPPET_VERSION=3.5.1
- PUPPET_VERSION=3.4.2
- PUPPET_VERSION=3.3.1
- PUPPET_VERSION=3.2.3
- PUPPET_VERSION=2.7.21
global:
- PUBLISHER_LOGIN=huit
- secure: Ijc9NOKcofDC+i0afauvFj7P6vqtThbeMnjuOYxaqcMPfM4f+IrxpzyoIjOzDbD83b0vMYCSItPW/RExVINkwhjghfzPhMsbjfA2XfcvWYMxCOsvXR3TMHSNyPGD7ITbitUDofJ0TTIfZQwE10SeI8MhfL61a4eiR2QNQhDyraI=
matrix:
exclude:
- rvm: 1.8.7
env: PUPPET_VERSION=4.4.1
- rvm: 2.0.0
env: PUPPET_VERSION=2.7.21
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
1.7.2 - Ben Roberts <me@benroberts.net>
* Fix comparison of @localusers to undef for puppet3.7/ruby1.8
1.7.1 - Tim Hartmann <tfhartmann@gmail.com>
* Fixes issue #54 by adding configure_outputs parameter
1.7.0 - Joe Eaves <jinux@alluha.net>, Tim Hartmann <tfhartmann@gmail.com>
Expand Down
15 changes: 12 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-core', '3.1.7', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'iconv', :require => false
end

group :system_tests do
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end

if rubyversion = `ruby --version`
if rubyversion =~ /1.8.7/
gem 'rake', '10.3.2', :require => false
gem 'rspec-core', '2.99.2', :require => false
end
else
gem 'rake', :require => false
gem 'rspec-core', '3.1.7', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
gem 'facter', :require => false
end

if puppetversion = ENV['PUPPET_GEM_VERSION']
if puppetversion = ENV['PUPPET_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', :require => false
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
$localusers = $::splunk::params::localusers,
$licenseserver = undef,
$nagios_contacts = $::splunk::params::nagios_contacts,
$nagiosserver = $::splunk::nagiosserver,
$nagiosserver = undef,
$output_hash = $::splunk::params::output_hash,
$port = $::splunk::params::port,
$proxyserver = $::splunk::params::proxyserver,
Expand Down