aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-01Merge branch 'bmk/snmp/agent/vacmAccessTable-RowStatus-handling/OTP-10164' ↵Micael Karlberg
into bmk/snmp/snmp4221_integration Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-08-01Merge branch 'bmk/snmp/agent/test_case_entry_and_exit_info' into ↵Micael Karlberg
bmk/snmp/snmp4221_integration
2012-08-01[snmp/agent] Printout (of agent info) using plain print functionMicael Karlberg
Printout (of agent info) using plain print function rather than debug (DBG) macro.
2012-08-01[snmp/agent] Add agent info printout at begin and end of test caseMicael Karlberg
Add agent info ( snmpa:info() ) in the init_per_testcase and end_per_testcase in the agent test suite. Also display (print) the audit trail log in the end_per_testcase.
2012-08-01Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132' into ↵Micael Karlberg
bmk/snmp/snmp4221_integration Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-08-01Merge branch 'bmk/snmp/manager/log_to_io/OTP-10066' into ↵Micael Karlberg
bmk/snmp/snmp4221_integration
2012-08-01[snmp] Add proper version, release notes and appup instructionMicael Karlberg
2012-08-01[snmp/agent] CleanupMicael Karlberg
2012-08-01[snmp] Add release notes, appup instruction and proper versionMicael Karlberg
2012-08-01[snmp/agent] Errors in vacmAccessTable RowStatus handlingStefan Zegenhagen
There are problems with the handling of vacmAccessTableStatus that cause some SNMP test suites to report errors. Most notably, errorneous set operations frequently cause "genErr" errors to be returned which usually is a sign for bad coding. These "genErr" errors are usually caused by badmatch exceptions coming from {ok, Row} = snmpa_vacm:get_row(RowIndex) if the row does not exist. This patch fixes the badmatch errors and adjusts the semantic of the RowStatus handling in that table to be compliant with the RowStatus textual description of SNPMv2-TC MIB.
2012-07-25Merge branch 'egil/change-os_mon-ports-error-messages/OTP-10161' into maintBjörn-Egil Dahlberg
* egil/change-os_mon-ports-error-messages/OTP-10161: os_mon: Elucidate port program error messages
2012-07-25Merge branch 'egil/fix-install-osx-readme' into maintBjörn-Egil Dahlberg
* egil/fix-install-osx-readme: Clean up Install Erlang on OSX
2012-07-25Clean up Install Erlang on OSXBjörn-Egil Dahlberg
2012-07-25Merge branch 'egil/fix-inet-bit8-doc' into maintBjörn-Egil Dahlberg
* egil/fix-inet-bit8-doc: doc: Fix faulty tag in inet bit8 documentation
2012-07-24doc: Fix faulty tag in inet bit8 documentationBjörn-Egil Dahlberg
2012-07-24os_mon: Elucidate port program error messagesBjörn-Egil Dahlberg
Try to avoid confusion of the message 'Erlang has closed' by clarifying that the message is sent from os_mon port programs.
2012-07-19Merge branch 'lukas/common_test/surefire_fix_skipped_end/OTP-10158' into maintLukas Larsson
* lukas/common_test/surefire_fix_skipped_end/OTP-10158: Fix bug where auto skipped tcs would disappear Allow non configlist returns from other cths Fix close of suite when end_per_suite is skipped
2012-07-19Merge branch 'lukas/common_test/ct_notify/OTP-10157' into maintLukas Larsson
* lukas/common_test/ct_notify/OTP-10157: Add ct:notify and ct:sync_notify
2012-07-19Add ct:notify and ct:sync_notifyLukas Larsson
2012-07-18Update preloadedHenrik Nord
2012-07-18Merge branch 'ta/prim_archive-reloading' into maintHenrik Nord
* ta/prim_archive-reloading: escript_SUITE: remove gratuitous space [erts,kernel,stdlib] fix escript/primary archive reloading Conflicts: erts/preloaded/src/erl_prim_loader.erl OTP-10151
2012-07-18Merge branch 'ms/correct-formating-in-exit' into maintHenrik Nord
* ms/correct-formating-in-exit: Correct formating in exit error messages OTP-10148
2012-07-18Merge branch 'tc/rpc-call-fix' into maintHenrik Nord
* tc/rpc-call-fix: Fix rpc:call/5 for local calls with a finite Timeout OTP-10149
2012-07-18Merge branch 'jv/forms-source' into maintHenrik Nord
* jv/forms-source: Allow the source to be set when compiling forms OTP-10150
2012-07-18Merge branch 'at/fix_asn1_typo' into maintHenrik Nord
* at/fix_asn1_typo: Fix typo error in selected decode function OTP-10152
2012-07-16Merge branch 'hb/erl_docgen/cref_spaces/OTP-10138' into maintHans Bolinder
* hb/erl_docgen/cref_spaces/OTP-10138: erts: add space before '*' in some function prototypes ic: add space before '*' in some function prototypes Fix a bug regarding spaces in C function prototypes
2012-07-11Merge branch 'siri/erl_prim_loader/archive-scripts/OTP-10071' into maintSiri Hansen
* siri/erl_prim_loader/archive-scripts/OTP-10071: Update preloaded Add tests for problems with handling of primary archive Add comments to make erl_prim_loader primary archive handling more readable Fix erl_prim_loader errors in handling of primary archive
2012-07-11Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint-r15/OTP-10132' into ↵Micael Karlberg
bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132
2012-07-11erts: add space before '*' in some function prototypesHans Bolinder
2012-07-11ic: add space before '*' in some function prototypesHans Bolinder
2012-07-11Fix a bug regarding spaces in C function prototypesHans Bolinder
Thanks to Richard O'Keefe for pointing the bug out.
2012-07-10Fixed problem with TimeTicks decodeMicael Karlberg
The decoder had a problem with data of type TimeTicks. Also, the handling of invalid values (value out of range) was bad for both TimeTicks and Unsigned32. OTP-10132
2012-07-10Fixed pdf text "overflow" problems in the documentationMicael Karlberg
2012-07-10Merge branch 'gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130' ↵Gustav Simonsson
into maint * gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130: Change testcase of gen_server:enter_loop/4 with global scope to match on result of a gen_server:call/2 Correct guard matching in gen_server:enter_loop/4 to match global scope in ServerName without timeout.
2012-07-10Update preloadedSiri Hansen
erl_prim_loader.beam
2012-07-10Add tests for problems with handling of primary archiveSiri Hansen
Thanks to Tuncer Ayaz for co-authoring.
2012-07-09Add comments to make erl_prim_loader primary archive handling more readableSiri Hansen
This commit introduces no functional change. It only adds comments and changes some function/variable names.
2012-07-09Fix erl_prim_loader errors in handling of primary archiveSiri Hansen
The following errors have been corrected: * If primary archive was named "xxx", then a file in the same directory named "xxxyyy" would be interpreted as a file named yyy inside the archive. * erl_prim_loader did not correctly create and normalize absolute paths for primary archive and files inside it, so unless given with exact same path files inside the archive would not be found. E.g. if escript was started as /full/path/to/xxx then "./xxx/file" would not be found since erl_prim_loader would try to match /full/path/to/xxx with /full/path/to/./xxx. Same problem with ../. * Depending on how the primary archive was built, erl_prim_loader:list_dir/1 would sometimes return an empty string inside the file list. This was a virtual element representing the top directory of the archive. This has been removed. Thanks to Tuncer Ayaz and Shunichi Shinohara for reporting and co-authoring corrections.
2012-07-06escript_SUITE: remove gratuitous spaceTuncer Ayaz
2012-07-06[erts,kernel,stdlib] fix escript/primary archive reloadingTuncer Ayaz
If the mtime of an escript/primary archive file changes after being added to the code path, correctly reload the archive and update the cache. The existing code didn't consider that it might be a zip archive and failed: =ERROR REPORT==== 3-Aug-2011::09:21:21 === File operation error: bad_central_directory. Target: /escript_archive/module.beam. Function: get_file. Process: code_server. Thanks David Reid and Hakan Mattson.
2012-07-06Merge branch 'slf/dtrace-nif-N-probes' into maintHenrik Nord
* slf/dtrace-nif-N-probes: Remove crufty scaffolding code Add 1024 separate USDT probes to dyntrace.erl and dyntrace.c Conflicts: lib/runtime_tools/src/dyntrace.erl OTP-10143
2012-07-06Merge branch 'slf/dyntrace-comment-and-func-cleanup' into maintHenrik Nord
* slf/dyntrace-comment-and-func-cleanup: dyntrace.erl comment cleanup and unused function removal OTP-10141
2012-07-06Merge branch 'sz/dtrace-message-send-fix' into maintHenrik Nord
* sz/dtrace-message-send-fix: DTrace bug in message-send OTP-10142
2012-07-04Merge branch 'sverk/hipe-arm-fix' into maintSverker Eriksson
* sverk/hipe-arm-fix: hipe_arm.c: remove dead code Workaround gcc bug affecting ARM debug build Fix compile error of HIPE enabled DEBUG emulator for ARM Fix hipe bif calling bug on ARM Add armv7l and armv5tejl as a recognized ARM architectures OTP-10137
2012-07-04Change testcase of gen_server:enter_loop/4 with global scopeGustav Simonsson
to match on result of a gen_server:call/2
2012-07-03Correct guard matching in gen_server:enter_loop/4Gustav Simonsson
to match global scope in ServerName without timeout. OTP-10130
2012-07-03Merge branch 'hb/kernel/fix_spec_disk_log/OTP-10131' into maintHans Bolinder
* hb/kernel/fix_spec_disk_log/OTP-10131: Correct the type of the disk log header
2012-07-02Correct the type of the disk log headerHans Bolinder
Thanks to Niclas Eklund.
2012-06-29Merge branch 'egil/install-osx' into maintBjörn-Egil Dahlberg
2012-06-29doc: Update MacOSX install HowTo for Xcode 4.3Björn-Egil Dahlberg