Merge branch '1.6rc' into 1.6.x

puppetlabs · Sep 11, 2012 · 60387ef · 60387ef
2 parents 30433e4 + 5a3e537
commit 60387ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,8 @@
-1.6.12-rc2
+1.6.12
 ===
 398b111 (Maint) Extract common elements of selinux tests
 c534126 (#10819) Avoid reading from /proc/self/mounts in ruby
 b95ea54 fix yum repo path in yaml file
-
-1.6.12rc1
-===
 3ad05f1 Remove version test from facter
 fce4b01 fix redhat spec release template variable
 903b1d9 Stop using sed to generate the preflight erb

diff --git a/lib/facter/version.rb b/lib/facter/version.rb
@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.6.12-rc2'
+    FACTERVERSION = '1.6.12'
   end
 
   def self.version