Merge pull request #38 from jhoblitt/feature/v2.3.0

Feature/v2.3.0
jhoblitt · Sep 14, 2014 · adddbf5 · adddbf5
2 parents 7306e3a + 925effc
commit adddbf5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 93 deletions.
diff --git a/.nodeset.yml b/.nodeset.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 
 #### [Current]
+ * [65306af](../../commit/65306af) - __(Joshua Hoblitt)__ mv all rspec-puppet tests under ./spec/unit/
+ * [155eca5](../../commit/155eca5) - __(Joshua Hoblitt)__ remove rspec-system support
+ * [7306e3a](../../commit/7306e3a) - __(Joshua Hoblitt)__ Merge pull request [#37](../../issues/37) from razorsedge/fedora_config_location
+
+Fedora config location
+ * [293a6b2](../../commit/293a6b2) - __(Michael Arnold)__ Fix the RedHat bits to better match the Fedora PR.
+ * [bbcae38](../../commit/bbcae38) - __(Michael Arnold)__ Better support for RedHat smartmontools 6.x.
+
+Fixing Fedora support similar to [#36](../../issues/36).
+
+ * [71acbcc](../../commit/71acbcc) - __(Joshua Hoblitt)__ Merge pull request [#36](../../issues/36) from razorsedge/el7_config_location
+
+Add in support for EL 7 new config location.
+ * [399ac1a](../../commit/399ac1a) - __(Michael Arnold)__ Add in support for EL 7 new config location.
+
+EL 7 now puts the smartd.conf in /etc/smartmontools.
+
+#### v2.2.3
+ * [a29b3e6](../../commit/a29b3e6) - __(Joshua Hoblitt)__ bump version to v2.2.3
  * [2689cb1](../../commit/2689cb1) - __(Joshua Hoblitt)__ Merge pull request [#34](../../issues/34) from solarkennedy/debian_support
 
 Added debian support and working tests. Closes [#32](../../issues/32)

diff --git a/Gemfile b/Gemfile
@@ -6,13 +6,9 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                                :require => false
-gem 'puppetlabs_spec_helper',              :require => false
-gem 'puppet-lint',                         :require => false
-gem 'puppet-syntax',                       :require => false
-gem 'rspec-system',                        :require => false
-gem 'rspec-system-puppet',                 :require => false
-gem 'rspec-system-serverspec', '>= 2.0.1', :require => false
-gem 'serverspec',                          :require => false
+gem 'rake',                    :require => false
+gem 'puppetlabs_spec_helper',  :require => false
+gem 'puppet-lint',             :require => false
+gem 'puppet-syntax',           :require => false
 
 # vim:ft=ruby
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name 'jhoblitt-smartd'
-version '2.2.3'
+version '2.3.0'
 
 author 'Joshua Hoblitt <[email protected]>'
 license 'MIT'

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,6 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-lint/tasks/puppet-lint'
-require 'rspec-system/rake_task'
 
 PuppetLint.configuration.send("disable_class_inherits_from_params_class")
 PuppetLint.configuration.ignore_paths = [

diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
diff --git a/spec/system/smartd_spec.rb b/spec/system/smartd_spec.rb
diff --git a/spec/classes/params_spec.rb → spec/unit/classes/params_spec.rb b/spec/classes/params_spec.rb → spec/unit/classes/params_spec.rb
diff --git a/spec/classes/smartd_spec.rb → spec/unit/classes/smartd_spec.rb b/spec/classes/smartd_spec.rb → spec/unit/classes/smartd_spec.rb