Commit 2520ab4a authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.2.x' into 2.3.x

parents dcb42c36 7de27113
...@@ -20,7 +20,7 @@ elif [[ $RELEASE_TYPE = "RC" ]]; then ...@@ -20,7 +20,7 @@ elif [[ $RELEASE_TYPE = "RC" ]]; then
stageVersion=$( get_next_rc_release $snapshotVersion) stageVersion=$( get_next_rc_release $snapshotVersion)
nextVersion=$snapshotVersion nextVersion=$snapshotVersion
elif [[ $RELEASE_TYPE = "RELEASE" ]]; then elif [[ $RELEASE_TYPE = "RELEASE" ]]; then
stageVersion=$( get_next_release $snapshotVersion) stageVersion=$( get_next_release $snapshotVersion "RELEASE" )
nextVersion=$( bump_version_number $snapshotVersion) nextVersion=$( bump_version_number $snapshotVersion)
else else
echo "Unknown release type $RELEASE_TYPE" >&2; exit 1; echo "Unknown release type $RELEASE_TYPE" >&2; exit 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment