From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 5 Mar 2014 17:54:02 +0000 (-0500)
Subject: Merge pull request #230 from daenney/apt-key-defined
X-Git-Tag: 1.5.0~30
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ab6f6d31468ae865d1ff8ba7ec108802d5b27625;hp=b2ae1cb08d54b87977dc370601fb662469b256f4;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #230 from daenney/apt-key-defined

Rework apt::key to use apt_key.
---

diff --git a/.travis.yml b/.travis.yml
index a6cfda6..5a26d90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ branches:
 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
@@ -19,12 +16,6 @@ env:
     - PUPPET_GEM_VERSION="~> 3.2.0"
     - PUPPET_GEM_VERSION="~> 3.3.0"
     - PUPPET_GEM_VERSION="~> 3.4.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ipB/CV1rVSTXU9ZDuzrFOlzJrRmJob36tKns2xszuH4r9s5P9qivNAngRGdV
-      msb69xvOlzQykM0WRF+4kJ6TZ7AbMiDI+VZ8GDtsRaU5/q3BpsvFe8aato+6
-      QeyFtBG62OsosTEhGws4mqiFsPDu3dHlakuJc9zevlTuhNwbKSs=
 matrix:
   fast_finish: true
   exclude: