summaryrefslogtreecommitdiff
path: root/RELEASE_PROCESS.markdown
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2011-08-04 17:20:39 -0700
committerJeff McCune <jeff@puppetlabs.com>2011-08-04 17:24:46 -0700
commit0466e1bc6fc1864501ef380d0ca10eda98ee24dc (patch)
tree8336964f1cf88e2ffc9ca3b6568b93f5bb2386d6 /RELEASE_PROCESS.markdown
parent7e3b9b728acc0d6b563b096957e030ce583ee15f (diff)
Update CHANGELOG and README for 1.0.0
Diffstat (limited to 'RELEASE_PROCESS.markdown')
-rw-r--r--RELEASE_PROCESS.markdown3
1 files changed, 2 insertions, 1 deletions
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