aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-06-18 09:55:58 +0200
committerSiri Hansen <[email protected]>2014-06-18 09:55:58 +0200
commite08762b65f13fa4e5eeb030eaf56be73433aa5f4 (patch)
tree1c1454d1f5ecd7082b5304fd65ad0c830f769009
parentbc9085f3eb033a99d128cba9403a63c9b3d51644 (diff)
parent0b54f4c6d8901a516e84b670598f375f0cac77f9 (diff)
downloadotp-e08762b65f13fa4e5eeb030eaf56be73433aa5f4.tar.gz
otp-e08762b65f13fa4e5eeb030eaf56be73433aa5f4.tar.bz2
otp-e08762b65f13fa4e5eeb030eaf56be73433aa5f4.zip
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests: [upgrade_SUITE] Set previous major to r16b
-rw-r--r--erts/test/upgrade_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index ee84a5dfd7..d5a920e03d 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -264,7 +264,7 @@ do_upgrade(FromVsn,FromApps,ToRel,ToApps,InstallDir) ->
%%%-----------------------------------------------------------------
%%% Library functions
previous_major("17") ->
- "r16";
+ "r16b";
previous_major(Rel) ->
integer_to_list(list_to_integer(Rel)-1).