Merge branch 'master' of github.com:jboner/akka

project/scripts/find-replace.sh

@@ -22,7 +22,7 @@ echo "Find and replace: $FIND --> $REPLACE"
 
 # Exclude directories from search
 
-excludedirs=".git dist deploy embedded-repo lib_managed project/boot project/scripts src_managed target"
+excludedirs=".git dist deploy embedded-repo lib_managed project/boot project/scripts src_managed target akka-docs"
 
 echo "Excluding directories: $excludedirs"
 

project/scripts/release

@@ -1,12 +1,8 @@
+sh git checkout -b release-{{release.arg1}}
 clean
-sh rm -rf dist
-sh rm -rf deploy
 script find-replace.sh {{project.version}} {{release.arg1}}
 script find-replace.sh //[[:space:]]*release:[[:space:]]*
 reload
 build-release
 sh git commit -am 'Update version for release {{project.version}}'
 sh git tag -m 'Version {{project.version}}' v{{project.version}}
-sh git revert -n HEAD
-sh git commit -am 'Restoring SNAPSHOT version'
-reload

project/scripts/test-release

@@ -1,6 +1,4 @@
 clean
-sh rm -rf dist
-sh rm -rf deploy
 clean-lib
 script find-replace.sh {{project.version}} {{test-release.arg1}}
 script find-replace.sh //[[:space:]]*release:[[:space:]]*