From 0aee5c94d295f04f7c5591627827eb5517601528 Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Mon, 10 Nov 2014 14:54:36 -0800 Subject: [PATCH 1/4] Prior to this there was generic :test group. Unfortunately Beaker will be EOL-ing support for Ruby 1.8 (a number of Beaker's dependencies already have and pinning to older versions is becoming costly). Once Beaker does this it will cause failures whenever running `bundle install`. To avoid this failure we can segregate the system testing gems, allowing unit, lint and development to continue with `bundle install --without system_tests.` --- Gemfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 31c883e91..dc3cd331d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,18 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" -group :development, :test do +group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'serverspec', :require => false gem 'puppet-lint', :require => false - gem 'beaker-rspec', :require => false gem 'puppet_facts', :require => false end +group :system_tests do + gem 'beaker-rspec', :require => false + gem 'serverspec', :require => false +end + if facterversion = ENV['FACTER_GEM_VERSION'] gem 'facter', facterversion, :require => false else From 67bae9f58cd9d05a5790f7776b79dee77040f16a Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Mon, 10 Nov 2014 16:08:40 -0800 Subject: [PATCH 2/4] Fix issues URL and make format match puppet module build --- metadata.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/metadata.json b/metadata.json index f00ff1818..1a2ff6ea1 100644 --- a/metadata.json +++ b/metadata.json @@ -6,7 +6,7 @@ "license": "Apache 2.0", "source": "git://github.com/puppetlabs/puppetlabs-mysql.git", "project_page": "http://github.com/puppetlabs/puppetlabs-mysql", - "issues_url": "https://github.com/puppetlabs/puppetlabs-mysql/issues", + "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -75,9 +75,6 @@ ], "description": "Mysql module", "dependencies": [ - { - "name": "puppetlabs/stdlib", - "version_requirement": ">= 3.2.0" - } + {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"} ] } From c5c1b3840e557fa3592a1af8e6a10972e6fd63ff Mon Sep 17 00:00:00 2001 From: Travis Fields Date: Fri, 7 Nov 2014 15:21:17 -0800 Subject: [PATCH 3/4] Prepare for 3.0.0 release --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f004f98b..ddf6f7ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +##2014-11-11 - Supported Release 3.0.0 +###Summary + +Added several new features including MariaDB support and future parser + +####Features +* Add MariaDB Support +* Renamed `database_user` to `mysql_user` +* Renamed `database` to `mysql_database` +* Renamed `database_grant` to `mysql_grant` +* The mysqltuner perl script has been updated to 1.3.0 based on work at http://github.com/major/MySQLTuner-perl +* Add future parse support, fixed issues with undef to empty string +* Pass the backup credentials to 'SHOW DATABASES' +* Ability to specify the Includedir for `mysql::server` +* `mysql::db` now has an import_timeout feature that defaults to 300 +* The `mysql` class has been removed +* `mysql::server` now takes an `override_options` hash that will affect the installation +* Ability to install both dev and client dev + +####BugFix +* `mysql::server::backup` now passes `ensure` param to the nested `mysql_grant` +* `mysql::server::service` now properly requires the presence of the `log_error` file +* `mysql::config` now occurs before `mysql::server::install_db` correctly + ##2014-07-15 - Supported Release 2.3.1 ###Summary From 46c53dbbd78299606f1e88a1862963969f3ebd2b Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 10 Nov 2014 16:18:50 -0800 Subject: [PATCH 4/4] clarify changelog for major release --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddf6f7ff4..3a85ed788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,16 +3,16 @@ Added several new features including MariaDB support and future parser +####Backwards-incompatible Changes +* Remove the deprecated `database`, `database_user`, and `database_grant` resources. The correct resources to use are `mysql`, `mysql_user`, and `mysql_grant` respectively. + ####Features * Add MariaDB Support -* Renamed `database_user` to `mysql_user` -* Renamed `database` to `mysql_database` -* Renamed `database_grant` to `mysql_grant` * The mysqltuner perl script has been updated to 1.3.0 based on work at http://github.com/major/MySQLTuner-perl * Add future parse support, fixed issues with undef to empty string * Pass the backup credentials to 'SHOW DATABASES' * Ability to specify the Includedir for `mysql::server` -* `mysql::db` now has an import_timeout feature that defaults to 300 +* `mysql::db` now has an import\_timeout feature that defaults to 300 * The `mysql` class has been removed * `mysql::server` now takes an `override_options` hash that will affect the installation * Ability to install both dev and client dev