Revert "Ensure Travis runs with the right Puppet"

This reverts commit e12dbd2f9a.
This commit is contained in:
Brett Porter
2013-08-02 07:31:01 +10:00
parent e12dbd2f9a
commit a94f5195e0

View File

@@ -14,10 +14,10 @@ rvm:
- 2.0.0 - 2.0.0
env: env:
matrix: matrix:
- PUPPET_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 2.7.0"
- PUPPET_VERSION="~> 3.0.0" - PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_VERSION="~> 3.1.0" - PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_VERSION="~> 3.2.0" - PUPPET_GEM_VERSION="~> 3.2.0"
global: global:
- PUBLISHER_LOGIN=puppetlabs - PUBLISHER_LOGIN=puppetlabs
- secure: |- - secure: |-
@@ -27,14 +27,14 @@ env:
matrix: matrix:
exclude: exclude:
- rvm: 1.9.3 - rvm: 1.9.3
env: PUPPET_VERSION="~> 2.7.0" env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0 - rvm: 2.0.0
env: PUPPET_VERSION="~> 2.7.0" env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0 - rvm: 2.0.0
env: PUPPET_VERSION="~> 3.0.0" env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: 2.0.0 - rvm: 2.0.0
env: PUPPET_VERSION="~> 3.1.0" env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_VERSION="~> 3.2.0" env: PUPPET_GEM_VERSION="~> 3.2.0"
notifications: notifications:
email: false email: false