diff --git a/HISTORY.md b/HISTORY.md index 5ab41c12e..4e3ad06f1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -16,6 +16,21 @@ ### New Features +- #2822: @josegonzalez refactor: allow skipping cleanup on a per-application basis +- #2754: @fzerorubigd Add support for set DOKKU_IMAGE per app +- #2815: @markstory Add stickler-ci configuration. +- #2809: @oliw Remove aufs step from Makefile +- #2785: @josegonzalez Add a release-plugin binary +- #2777: @stokarenko Turn on ps-post-stop hook. +- #2781: @fruitl00p Adds docker.io support +- #2766: @josegonzalez Upgrade to herokuish 0.3.29 +- #2765: @josegonzalez Install python3-software-properties as an alternative to python-software-properties +- #2642: @chiedo Added better default nginx error pages +- #2678: @callahad Default to secure PCI-compliant SSL setup +- #2734: @josegonzalez Allow quieter report output + +### Documentation + - #2803: @iSDP Adding related articles on the Docker Image Deployment page - #2798: @znz Update CURL_CONNECT_TIMEOUT in docs - #2795: @josegonzalez docs: Add documentation around adding build-time configuration variables @@ -39,21 +54,6 @@ - #2719: @joshco Clarify that nginx.conf.sigil must be committed to repository - #2715: @josegonzalez Use urls that are linkable on github -### Documentation - -- #2822: @josegonzalez refactor: allow skipping cleanup on a per-application basis -- #2754: @fzerorubigd Add support for set DOKKU_IMAGE per app -- #2815: @markstory Add stickler-ci configuration. -- #2809: @oliw Remove aufs step from Makefile -- #2785: @josegonzalez Add a release-plugin binary -- #2777: @stokarenko Turn on ps-post-stop hook. -- #2781: @fruitl00p Adds docker.io support -- #2766: @josegonzalez Upgrade to herokuish 0.3.29 -- #2765: @josegonzalez Install python3-software-properties as an alternative to python-software-properties -- #2642: @chiedo Added better default nginx error pages -- #2678: @callahad Default to secure PCI-compliant SSL setup -- #2734: @josegonzalez Allow quieter report output - ## 0.9.4 ### Documentation diff --git a/contrib/release b/contrib/release index 4c02376e7..427ea22e3 100755 --- a/contrib/release +++ b/contrib/release @@ -242,14 +242,14 @@ fn-repo-update-history-and-commit() { HISTORY="${HISTORY}"$'\n'"$HISTORY_BUG" fi - if [[ "$HISTORY_DOCUMENTATION" ]]; then + if [[ "$HISTORY_ENHANCEMENT" ]]; then HISTORY="${HISTORY}"$'\n\n'"### New Features" - HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION" + HISTORY="${HISTORY}"$'\n'"$HISTORY_ENHANCEMENT" fi - if [[ "$HISTORY_ENHANCEMENT" ]]; then + if [[ "$HISTORY_DOCUMENTATION" ]]; then HISTORY="${HISTORY}"$'\n\n'"### Documentation" - HISTORY="${HISTORY}"$'\n'"$HISTORY_ENHANCEMENT" + HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION" fi sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak