From e3fc5b95d133aee1ae3dc188e6c47e88786dfc6e Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Thu, 14 Oct 2010 14:26:24 +1100
Subject: Updated CHANGELOG and version for 2.6.3rc1

---
 CHANGELOG     | 7 +++++++
 lib/puppet.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f0c596ee5..1a28fd8e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
+2.6.3rc1
+========
+3c56705  Fix for #4832 -- Making PSON handle arbitrary binary data
+e232770  Minimal fix for #4975 -- only call chage when managing password age rules
+a090e86  Fix for #4963 -- Use correct commands for password expiry on solaris
+
 2.6.2
 =====
+295c3be  Updated CHANGELOG for 2.6.2
 1d719be  Fix for #4945 -- explicitly check os to supress man page installation
 55417bc  Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6
 a6e2bea  Fixed #4919 - added parenths to fix error message:
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 0a90cf50c..78fb5138b 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.2'
+  PUPPETVERSION = '2.6.3'
 
   def Puppet.version
     PUPPETVERSION
-- 
cgit