From 4f6b5b21c188576e75ca1513c88dc0352aac402d Mon Sep 17 00:00:00 2001 From: Michael T Lombardi Date: Wed, 3 Jan 2018 16:13:01 -0600 Subject: [PATCH] (maint) modulesync 65530a4 Update Travis Related: https://github.com/puppetlabs/modulesync_configs/pull/177 --- .gitignore | 2 +- .travis.yml | 3 --- Gemfile | 1 - NOTICE | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e5e6f9e8a..a1022772e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -#This file is generated by ModuleSync, do not edit.Z +# This file is generated by ModuleSync, do not edit. *.iml .*.sw[op] .DS_Store diff --git a/.travis.yml b/.travis.yml index 6055eb19c..47c6d8deb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ sudo: false language: ruby cache: bundler script: "bundle exec rake release_checks" -#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203 -before_install: - - gem update bundler matrix: fast_finish: true include: diff --git a/Gemfile b/Gemfile index 4ed22771f..84b23f2b4 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,6 @@ group :system_tests do gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') gem "puppet-blacksmith", '~> 3.4', :require => false - gem "beaker-task_helper" end gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) diff --git a/NOTICE b/NOTICE index dc225e80e..efe67c40a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ Puppet Module - puppetlabs-mysql -Copyright 2017 Puppet, Inc. +Copyright 2018 Puppet, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.