diff options
| author | Siri Hansen <[email protected]> | 2011-11-18 14:55:40 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-18 14:55:40 +0100 |
| commit | 405322cc25ae4343ec824c2d611553534d1b1b92 (patch) | |
| tree | 8e58b80de7fa8585261fa9315c141a49d21f2177 /.gitattributes | |
| parent | 6e024b633005fa53ff67d0222b42d983f8ea85f8 (diff) | |
| parent | cc7c2a74ee9074357f6ab0701be61e7bb57004ef (diff) | |
| download | otp-405322cc25ae4343ec824c2d611553534d1b1b92.tar.gz otp-405322cc25ae4343ec824c2d611553534d1b1b92.tar.bz2 otp-405322cc25ae4343ec824c2d611553534d1b1b92.zip | |
Merge branch 'siri/sasl/upgrade-erts/OTP-9438'
* siri/sasl/upgrade-erts/OTP-9438:
Fix bug in erts upgrade on windows
Add release vsn info to erts_vsn_changed warning
Check for sasl application in systools:make_script and make_relup
Add syntax check of relup to check_install_release and install_release
Add documentation for upgrade from pre R15 to post R15 sasl
Handle upgrade from pre R15 to post R15 sasl
Step version of sasl to 2.2 for R15
Document upgrade instructions restart_new_emulator and restart_emulator
Wait for two restarts in upgrade_restart test
Add restart_new_emulator instruction to kernel, stdlib and sasl appups
Distinguish restart_new_emulator from restart_emulator in upgrade instructions
Upgrade erts: merge sys.config for tmp release instead of using old
Allow regexp for version in .appup
Restart emulator before running upgrade script when erts is upgraded
Conflicts:
lib/sasl/src/release_handler.erl
lib/sasl/test/release_handler_SUITE.erl
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions