From 0466e1bc6fc1864501ef380d0ca10eda98ee24dc Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 4 Aug 2011 17:20:39 -0700
Subject: Update CHANGELOG and README for 1.0.0

---
 RELEASE_PROCESS.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'RELEASE_PROCESS.markdown')

diff --git a/RELEASE_PROCESS.markdown b/RELEASE_PROCESS.markdown
index df20730..ea40d5d 100644
--- a/RELEASE_PROCESS.markdown
+++ b/RELEASE_PROCESS.markdown
@@ -3,8 +3,9 @@
  * Work in a topic branch
  * Submit a github pull request
  * Address any comments / feeback
- * Merge into master using --no-fw
+ * Merge into master using --no-ff
  * Update the CHANGELOG
+ * Update the Modulefile
  * Create an annotated tag with git tag -a X.Y.Z -m 'version X.Y.Z'
  * Push the tag with git push origin --tags
  * Build a new package with puppet-module
-- 
cgit v1.2.3