aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-06-18 09:57:19 +0200
committerSiri Hansen <[email protected]>2014-06-18 09:57:19 +0200
commit81537c7f7241a941c9ed92996ab8897347b12bd7 (patch)
tree3379b2ecee1ea1f08d253779e78648b2f5bc7051
parent69cbc759212f398c9e5eff29f236014b4e88a640 (diff)
parente08762b65f13fa4e5eeb030eaf56be73433aa5f4 (diff)
downloadotp-81537c7f7241a941c9ed92996ab8897347b12bd7.tar.gz
otp-81537c7f7241a941c9ed92996ab8897347b12bd7.tar.bz2
otp-81537c7f7241a941c9ed92996ab8897347b12bd7.zip
Merge branch 'maint'
-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).