From: Ken Barber <ken@bob.sh>
Date: Sun, 2 Jun 2013 17:37:24 +0000 (+0100)
Subject: Merge branch 'template_deprecation_warnings'
X-Git-Tag: 1.1.1~7
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4f83e75083e39dd6f92694b2a322b422ca424c85;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'template_deprecation_warnings'

* template_deprecation_warnings:
  Update travis.yml to latest versions of puppet
  Remove deprecation warnings for pin.pref.erb as well
  add @ to variables in template
---

4f83e75083e39dd6f92694b2a322b422ca424c85