From eebcb0d47583e54899771b52bbbf1aa80e109f71 Mon Sep 17 00:00:00 2001 From: Eric Putnam Date: Mon, 9 Jan 2017 14:55:16 -0500 Subject: [PATCH 1/2] (FM-5990) release prep for 0.9.0 updates changelog and metadata --- CHANGELOG.md | 7 +++++++ metadata.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 909bac48..911b69c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +##Release 0.9.0 +###Summary +Small release that bumps up rspec version and adds a new parameter + +###Features +- Adds `followsymlinks` parameter + ##Release 0.8.0 ###Summary This release includes more testing, support for ruby 2.3.1, thin provisioning and manage mirrors. diff --git a/metadata.json b/metadata.json index b0d99aea..1b0de5d5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-lvm", - "version": "0.8.0", + "version": "0.9.0", "author": "Puppet Labs", "summary": "Provides Puppet types and providers to manage Logical Resource Management (LVM) features.", "license": "GPL-2.0", From ff60ebc70c2ae15749963cede5578bc146298b74 Mon Sep 17 00:00:00 2001 From: Eric Putnam Date: Thu, 12 Jan 2017 14:58:40 -0800 Subject: [PATCH 2/2] add blacksmith --- Gemfile | 19 ++++++++++--------- Rakefile | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index f44f7974..ac2cdb38 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,10 @@ source "https://rubygems.org" group :development, :test do gem 'rake' - gem 'rspec', "~> 3.4.0", :require => false - gem 'mocha', "~> 0.10.5", :require => false + gem 'rspec', "~> 3.4.0", :require => false + gem 'mocha', "~> 0.10.5", :require => false gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-blacksmith', :require => false end if puppetversion = ENV['PUPPET_GEM_VERSION'] @@ -15,12 +16,12 @@ end gem 'puppet-lint', '>= 1.0.0' gem 'puppet-lint-unquoted_string-check', :require => false -gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3' -gem 'public_suffix', :require => false if RUBY_VERSION > '1.9.3' -gem 'json', '<= 1.8' , :require => false if RUBY_VERSION < '2.0.0' -gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0' -gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9' -gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9' +gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3' +gem 'public_suffix', :require => false if RUBY_VERSION > '1.9.3' +gem 'json', '<= 1.8' , :require => false if RUBY_VERSION < '2.0.0' +gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0' +gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9' +gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9' if RUBY_VERSION < '2.0' gem 'mime-types', '<3.0', :require => false @@ -30,7 +31,7 @@ group :system_tests do if beaker_version = ENV['BEAKER_VERSION'] gem 'beaker', *location_for(beaker_version) end - gem 'beaker-puppet_install_helper', :require => false + gem 'beaker-puppet_install_helper', :require => false gem 'master_manipulator', '~> 1.2', :require => false end # vim:ft=ruby diff --git a/Rakefile b/Rakefile index a0e8569d..773ba382 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ require 'puppetlabs_spec_helper/rake_tasks' +require 'puppet_blacksmith/rake_tasks' require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.relative = true