diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-19 11:11:34 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-19 11:11:34 -0700 |
| commit | 72cd6fb383335a62d2d1ab656cdff39c34de0f19 (patch) | |
| tree | 65f9b57d8dc4fbcfda5eaedbae0f9938b70d30e1 /lib/puppet.rb | |
| parent | 16d1f784cd00f8b3c3381caede44159c309487d7 (diff) | |
| parent | 656eff821bec534a23e3e81e86ddbe3fc28f10ed (diff) | |
| download | puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.tar.gz puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.tar.xz puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.zip | |
Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.next
* tickets/2.6.x/4655-parameterized-classes-default-stages:
(#4655) Allow stage to be set using a default class parameter
Updated CHANGELOG for 2.6.8rc1
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index ef5fb7f06..a9ed2898c 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -24,7 +24,7 @@ require 'puppet/util/run_mode' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '2.6.7' + PUPPETVERSION = '2.6.8' def Puppet.version PUPPETVERSION |