summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-09 12:08:26 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-09 12:08:26 -0400
commite4d777e5ec333c819a6b87b5c0186f67e86361ee (patch)
treeb36957b74b417e68e9c09bf5300957d2e9f4857e /lib/puppet
parentcc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff)
parent3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 (diff)
Fix merge conflict in README
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions/debian_nextcodename.rb12
-rw-r--r--lib/puppet/parser/functions/debian_nextrelease.rb11
-rw-r--r--lib/puppet/parser/functions/debian_release.rb13
-rw-r--r--lib/puppet/parser/functions/debian_release_version.rb12
4 files changed, 0 insertions, 48 deletions
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
deleted file mode 100644
index ee59612..0000000
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_nextcodename, :type => :rvalue) do |args|
- case args[0]
- when "squeeze" then "wheezy"
- when "wheezy" then "jessie"
- when "jessie" then "stretch"
- when "stretch" then "sid"
- when "sid" then "experimental"
- else "sid"
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb
deleted file mode 100644
index 76c3e0d..0000000
--- a/lib/puppet/parser/functions/debian_nextrelease.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_nextrelease, :type => :rvalue) do |args|
- case args[0]
- when 'oldstable' then 'stable'
- when 'stable' then 'testing'
- when 'testing' then 'unstable'
- when 'unstable' then 'experimental'
- else 'unstable'
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
deleted file mode 100644
index 3f24ad0..0000000
--- a/lib/puppet/parser/functions/debian_release.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_release, :type => :rvalue) do |args|
- case args[0]
- when 'squeeze' then 'oldoldstable'
- when 'wheezy' then 'oldstable'
- when 'jessie' then 'stable'
- when 'stretch' then 'testing'
- when 'sid' then 'unstable'
- when 'experimental' then 'experimental'
- else 'testing'
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
deleted file mode 100644
index 32cafcb..0000000
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_release_version, :type => :rvalue) do |args|
- case args[0]
- when 'squeeze' then '6.0'
- when 'wheezy' then '7.0'
- when 'jessie' then '8.0'
- when 'stretch' then '9.0'
- when 'buster' then '10.0'
- else ''
- end
- end
-end