Merge branch 'template_deprecation_warnings'
authorKen Barber <ken@bob.sh>
Sun, 2 Jun 2013 17:37:24 +0000 (18:37 +0100)
committerKen Barber <ken@bob.sh>
Sun, 2 Jun 2013 17:37:24 +0000 (18:37 +0100)
commit4f83e75083e39dd6f92694b2a322b422ca424c85
treef612a32f4a6885b9106d6e826a0f103fc42e9b9b
parente01bbb61b294be1358b147e8de4966d5f4c6efda
parent54d6dcad82a663a0d39d9ea54e0ebd498c4ab73a
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