bad merge resolution caused broken build

sensu · Feb 26, 2013 · 5a767eb · 5a767eb
1 parent 09ab3f3
commit 5a767eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/manifests/package.pp b/manifests/package.pp
@@ -8,10 +8,10 @@
 class sensu::package(
   $version = 'latest',
   $notify_services = [],
-  $install_repo = true
+  $install_repo = 'true'
 ) {
 
-  if $install_repo == 'true' {
+  if $install_repo == 'true' or $install_repo == true {
     include sensu::repo
   }
 

diff --git a/spec/classes/sensu_init_spec.rb b/spec/classes/sensu_init_spec.rb
@@ -50,6 +50,8 @@
   context 'setting all params' do
     let(:params) { {
       :rabbitmq_password        => 'asdfjkl',
+      :server                   => true,
+      :client                   => false,
       :version                  => '0.9.10',
       :install_repo             => false,
       :rabbitmq_port            => '1234',
@@ -125,7 +127,7 @@
     let(:facts) { { :fqdn => 'myhost.domain.com', :ipaddress => '1.2.3.4' } }
 
     it { should contain_class('sensu::rabbitmq').with(
-      'notify_services'  => []
+      'notify_services'  => ''
     )}
   end