aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-02-14Make erlang-mode more compatible with package.elGleb Peregud
Package.el and Emacs package repositories (like ELPA or Marmalade place some requirements onto packages which are uploaded to them. This commit does minor cosmetic changes which makes it easier to create appropriate package file for those repositories.
2012-02-07Merge branch 'hb/erl_docgen/optimize_html_gen/OTP-9893' into maintHans Bolinder
* hb/erl_docgen/optimize_html_gen/OTP-9893: [erl_docgen] Optimize generation of HTML
2012-02-07Merge branch 'bjorn/hipe-test-cases' into maintBjörn Gustavsson
* bjorn/hipe-test-cases: debugger tests: Increase time trap timeout fprof_SUITE: Skip create_file_slow/1 if libraries are native etop_SUITE: Skip a test case if libraries are native-compiled Skip all inviso test cases if libraries are native-compiled erl_prim_loader_SUITE: Handle native-compiled erl_boot_server re_SUITE: Skip error_handling/1 if 're' is native code shell_SUITE: Handle different EXIT reasons from native code sofs_SUITE: Handle different EXIT reasons from native code erl_eval_SUITE: Skip test of parameterized modules if native code trace_port_SUITE: Skip test cases if 'lists' is native-compiled call_trace_SUITE: Skip test cases if libraries are native-compiled
2012-02-07erlang.xml: Fix a few typos and grammatical errorsBjörn Gustavsson
2012-02-06Merge branch 'raimo/parallel-make/OTP-9857' into maintRaimo Niskanen
* raimo/parallel-make/OTP-9857: Work around windows .pdb parallel make collision erts: Fix recently broken documentation build
2012-02-06debugger tests: Increase time trap timeoutBjörn Gustavsson
Some bit syntax test cases take much longer time to complete when libraries are in native code, probably because of context switches between the eval_bits module and the debugger modules.
2012-02-06fprof_SUITE: Skip create_file_slow/1 if libraries are nativeBjörn Gustavsson
2012-02-06etop_SUITE: Skip a test case if libraries are native-compiledBjörn Gustavsson
2012-02-06Skip all inviso test cases if libraries are native-compiledBjörn Gustavsson
2012-02-06erl_prim_loader_SUITE: Handle native-compiled erl_boot_serverBjörn Gustavsson
Since tracing is not supported on native-compiled modules and the inet_disconnects/1 test case depends on tracing, skip the test case if erl_boot_server is native.
2012-02-06re_SUITE: Skip error_handling/1 if 're' is native codeBjörn Gustavsson
2012-02-06Merge branch 'maint-r15' into maintMicael Karlberg
Conflicts: erts/vsn.mk
2012-02-06[erl_docgen] Optimize generation of HTMLHans Bolinder
2012-02-03Work around windows .pdb parallel make collisionRaimo Niskanen
2012-02-02Merge branch 'bmk/snmp4217_integration/r15' into maint-r15Erlang/OTP
* bmk/snmp4217_integration/r15: Prepare release [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-02-02Merge branch 'maint-r14' into maint-r15Björn Gustavsson
* maint-r14: Prepare release [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere Conflicts: erts/doc/src/notes.xml erts/vsn.mk
2012-02-02Merge branch 'bmk/snmp/snmp4217_integration/r14' into maint-r14Micael Karlberg
* bmk/snmp/snmp4217_integration/r14: [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-02-01Merge branch 'maint-r14' into maintBjörn Gustavsson
* maint-r14: Prepare release
2012-02-01Prepare releaseErlang/OTP
2012-02-01Merge branch 'hb/erl_docgen/multiple_funcs/OTP-9877' into maintHans Bolinder
* hb/erl_docgen/multiple_funcs/OTP-9877: Optimize and improve handling of multiple func:s.
2012-02-01Optimize and improve handling of multiple func:s.Hans Bolinder
2012-02-01Merge branch 'dgud/mnesia/table-locks/OTP-9890' into maintDan Gudmundsson
* dgud/mnesia/table-locks/OTP-9890: [Mnesia] More optimizations [Mnesia] Optimize double ets_lookups [Mnesia] Optimize for lookup instead of match_object [Mnesia] First try with ordered_set instead of bag
2012-01-31Merge branch 'rj/spaces-xmerl-doc' into maintHenrik Nord
* rj/spaces-xmerl-doc: Add missing spaces in xmerl doc OTP-9873
2012-01-31[Mnesia] More optimizationsDan Gudmundsson
If a transaction releases a write, it can be deleted directly since no read locks or other write locks can be present
2012-01-31[Mnesia] Optimize double ets_lookupsDan Gudmundsson
2012-01-31[Mnesia] Optimize for lookup instead of match_objectDan Gudmundsson
5% faster on tpcb
2012-01-31[Mnesia] First try with ordered_set instead of bagDan Gudmundsson
Switch to ordered_set so match_object matches partially bound keys, more efficient.
2012-01-31Merge branch 'dgud/observer/bug-fixes/OTP-9878' into maintDan Gudmundsson
* dgud/observer/bug-fixes/OTP-9878: [observer] Fixed refresh interval for table viewer [observer] Improved term formatting in table viewer [observer] Fixed regexp error handling [observer] Fix refresh dead process crash [observer] Fix bugs in edit table object [observer] Fix index reporting bug
2012-01-31Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14Erlang/OTP
* rickard/sched-compact-load/OTP-9695: Add switch that can disable scheduler compaction of load
2012-01-31Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14Micael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/snmpa.xml lib/snmp/src/agent/snmpa_mpd.erl lib/snmp/src/app/snmp.appup.src lib/snmp/test/snmp_agent_test.erl lib/snmp/vsn.mk
2012-01-31erts: Correct incorrect assertion in erl_alloc_util.cBjörn Gustavsson
The incorrect assertion would fire when '+Muramv true' has been given, i.e. when a reallocation always forces a move. Change the assertion to not call the lock checker if the mutex is not used (because the allocator will only be accessed from a specific scheduler and thus no lock is needed).
2012-01-30Merge branch 'maint-r15' into maintMicael Karlberg
2012-01-30Merge branch 'lukas/kernel/os_mon_in_file_SUITE/OTP-9889' into maintLukas Larsson
* lukas/kernel/os_mon_in_file_SUITE/OTP-9889: Use os_mon to get system information
2012-01-30Use os_mon to get system informationLukas Larsson
2012-01-30shell_SUITE: Handle different EXIT reasons from native codeBjörn Gustavsson
2012-01-27erts: Fix recently broken documentation buildRaimo Niskanen
2012-01-27Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4174_integration/r13: [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-01-27Merge branch ↵Micael Karlberg
'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r13' into bmk/snmp/snmp4174_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-27[observer] Fixed refresh interval for table viewerMatthew Evans
2012-01-27sofs_SUITE: Handle different EXIT reasons from native codeBjörn Gustavsson
2012-01-27erl_eval_SUITE: Skip test of parameterized modules if native codeBjörn Gustavsson
Parameterized modules are not supported by HiPE.
2012-01-26Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into ↵Micael Karlberg
bmk/snmp/snmp4174_integration/r13
2012-01-26[snmp/agent] Add proper release notesMicael Karlberg
OTP-9884
2012-01-26[snmp/agent] Wrong OID used for error message replyMicael Karlberg
When sending an error message (reply) regarding snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747
2012-01-26trace_port_SUITE: Skip test cases if 'lists' is native-compiledBjörn Gustavsson
2012-01-26call_trace_SUITE: Skip test cases if libraries are native-compiledBjörn Gustavsson
Skip test cases that trace lists or filename if those modules are native-compiled. While we are at it, also eliminate two compilation warnings.
2012-01-26[snmp/agent] Added backup check for local_dbMicael Karlberg
Added a backup check also for local_db (same as for the mib-server). Updated appup and set proper version (vsn.mk). Finally added test case for issue. OTP-9884
2012-01-26Merge branch 'bjorn/erts/fix-hipe-crash/OTP-9886' into maintBjörn Gustavsson
* bjorn/erts/fix-hipe-crash/OTP-9886: Fix crash in trace_info({M,F,A}, Flags) when M:F/A has native code
2012-01-26Update primary bootstrapBjörn Gustavsson
2012-01-26Merge branch 'bjorn/compiler/bif-call-bug/OTP-9866' into maintBjörn Gustavsson
* bjorn/compiler/bif-call-bug/OTP-9866: erl_lint: Disallow call to is_record/3 if there is a local is_record/3 Ensure that generated record operations don't call local functions