diff options
| author | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
| commit | f72c47077aab69170fa1ca56e6ce9a6b1fc9c402 (patch) | |
| tree | 773e55de49edd873ca867df73cce83e02f973e52 /lib | |
| parent | 721bf57600f9730a56f744150be34aa9e96457f8 (diff) | |
| parent | 5a9e3a456e8c9023222abb3ab08ae80323a1470a (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
README
manifests/init.pp
manifests/unattended_upgrades.pp
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/functions/debian_nextcodename.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/debian_release_version.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb index 3d5c3bd..f3190ef 100644 --- a/lib/puppet/parser/functions/debian_nextcodename.rb +++ b/lib/puppet/parser/functions/debian_nextcodename.rb @@ -1,8 +1,6 @@ module Puppet::Parser::Functions newfunction(:debian_nextcodename, :type => :rvalue) do |args| case args[0] - when "etch" then "lenny" - when "lenny" then "squeeze" when "squeeze" then "wheezy" when "wheezy" then "jessie" when "jessie" then "sid" diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb index 0abe90e..0a57fd3 100644 --- a/lib/puppet/parser/functions/debian_release_version.rb +++ b/lib/puppet/parser/functions/debian_release_version.rb @@ -1,8 +1,6 @@ module Puppet::Parser::Functions newfunction(:debian_release_version, :type => :rvalue) do |args| case args[0] - when 'etch' then '4.0' - when 'lenny' then '5.0' when 'squeeze' then '6.0' when 'wheezy' then '7.0' else '' |