diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
| commit | 7cf7cad70ec2b10a46b1f1c01a1d609467918492 (patch) | |
| tree | 49943be69110215a353b8a0c2f68b47098d93ee1 /lib/runtime_tools | |
| parent | 509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff) | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| download | otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.gz otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.bz2 otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.zip | |
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'lib/runtime_tools')
| -rw-r--r-- | lib/runtime_tools/src/system_information.erl | 1 | ||||
| -rw-r--r-- | lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl index f541d6e449..04cc33e1ad 100644 --- a/lib/runtime_tools/src/system_information.erl +++ b/lib/runtime_tools/src/system_information.erl @@ -371,6 +371,7 @@ erlang_system_info() -> logical_processors_online, logical_processors_available, driver_version, + nif_version, emu_args, ethread_info, beam_jump_table, diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat index 18938372a3..bdc510e838 100644 --- a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat +++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat @@ -9720,6 +9720,7 @@ {logical_processors_online,4}, {logical_processors_available,4}, {driver_version,"2.1"}, + {nif_version,"1.1"}, {taints,[]}]}, {erts_compile_info, [{ldflags,[]}, |