diff options
author | Lukas Larsson <[email protected]> | 2013-11-28 14:53:23 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2013-11-28 14:53:23 +0100 |
commit | 172ac461d7055b655a9b5c22c1d95a140624945f (patch) | |
tree | 362337ac628865f805d8b27ae7e32b54692ae260 /lib/erl_docgen/priv/js | |
parent | 0ce1af08e397ff1af25f6d3359ad5032f67bf7a8 (diff) | |
parent | e9c04e92199deb274e1bb74e4caecd296443ca5f (diff) | |
download | otp-172ac461d7055b655a9b5c22c1d95a140624945f.tar.gz otp-172ac461d7055b655a9b5c22c1d95a140624945f.tar.bz2 otp-172ac461d7055b655a9b5c22c1d95a140624945f.zip |
Merge branch 'lukas/erts/supercarrier_fix/OTP-11149' into maint
* lukas/erts/supercarrier_fix/OTP-11149:
Improve error info when main carrier creation fails
Conflicts:
erts/emulator/test/alloc_SUITE.erl
Diffstat (limited to 'lib/erl_docgen/priv/js')
0 files changed, 0 insertions, 0 deletions