From 42abb2a599e9c863ab890ef7d8d43db1acdfe84d Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 25 Jun 2014 18:01:00 -0700
Subject: Sync files

---
 .travis.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ed1b75c..ef2a36e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,33 @@
+---
 branches:
   only:
     - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
-      kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
-      IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
+  - PUPPET_GEM_VERSION="~> 2.7.0"
+  - PUPPET_GEM_VERSION="~> 3.3.0"
 matrix:
+  fast_finish: true
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 2.7.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 2.7.0"
 notifications:
   email: false
-# Temporary workaround for broken Rubygems on Travis
+after_success:
+- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
+- .forge-release/publish
 before_install:
-  - gem update --system 2.1.11
-  - gem --version
+- gem update --system 2.1.11
+- gem --version
+comments:
+- Temporary workaround for broken Rubygems on Travis
+
-- 
cgit v1.2.3