From: Markelov Anton <doublic@gmail.com>
Date: Sun, 2 Jun 2013 23:10:03 +0000 (+1100)
Subject: Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt
X-Git-Tag: 1.2.0~6^2~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6283f6cf7214c17efe628858e98d28e5526c79fd;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
	.travis.yml
	Modulefile
---

6283f6cf7214c17efe628858e98d28e5526c79fd
diff --cc .travis.yml
index 6db520f,a19074d..c825f5e
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,17 -1,29 +1,36 @@@
  language: ruby
+ bundler_args: --without development
+ script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
  rvm:
    - 1.8.7
- before_script:
- after_script:
- script: "rake spec"
- branches:
-   only:
-     - master
+   - 1.9.3
+   - ruby-head
  env:
++<<<<<<< HEAD
 +  - PUPPET_VERSION=3.0.1
 +  - PUPPET_VERSION=2.7.13
 +  - PUPPET_VERSION=2.7.6
 +  - PUPPET_VERSION=2.6.9
++=======
+   - PUPPET_GEM_VERSION="~> 2.6.0"
+   - PUPPET_GEM_VERSION="~> 2.7.0"
+   - PUPPET_GEM_VERSION="~> 3.0.0"
+   - PUPPET_GEM_VERSION="~> 3.1.0"
+   - PUPPET_GEM_VERSION="~> 3.2.0"
+ matrix:
+   exclude:
+     - rvm: ruby-head
+       env: PUPPET_GEM_VERSION="~> 3.0.0"
+     - rvm: ruby-head
+       env: PUPPET_GEM_VERSION="~> 3.1.0"
+     - rvm: 1.9.3
+       env: PUPPET_GEM_VERSION="~> 2.7.0"
+     - rvm: ruby-head
+       env: PUPPET_GEM_VERSION="~> 2.7.0"
+     - rvm: 1.9.3
+       env: PUPPET_GEM_VERSION="~> 2.6.0"
+     - rvm: ruby-head
+       env: PUPPET_GEM_VERSION="~> 2.6.0"
++>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
  notifications:
    email: false
- gemfile: .gemfile
diff --cc Modulefile
index 24dd985,d351142..dbf3f2e
--- a/Modulefile
+++ b/Modulefile
@@@ -8,4 -8,7 +8,11 @@@ description 'APT Module for Puppet
  project_page 'https://github.com/puppetlabs/puppetlabs-apt'
  
  ## Add dependencies, if any:
++<<<<<<< HEAD
 +dependency 'puppetlabs/stdlib', '>= 3.0.1'
++=======
+ #dependency 'puppetlabs/stdlib', '2.x'
+ # The dependency should be written as above but librarian-puppet
+ # does not support the expression as the PMT does.
+ dependency 'puppetlabs/stdlib', '>= 2.2.1'
++>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5