aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-27[common_test] Fix timing dependent bugs in test for ct_netconfcSiri Hansen
Some of the tests failed every now and then because an ets table in the test netconf server was updated from different processes simultaneously. Also, the same entries were used for multiple netconf sessions. This has been corrected.
2012-08-27Make sure the test can never hang when ct:break/1/2 is calledPeter Andersson
2012-08-27ssh: Correct dialyzer specsIngela Anderton Andin
2012-08-27Merge branch 'maint'Siri Hansen
2012-08-27Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Close log files when deleting ct_conn_log_h error handler
2012-08-27Merge branch 'maint'Björn-Egil Dahlberg
2012-08-27Merge branch 'bmk/megaco/r15b02_cleanup/OTP-10199' into maintBjörn-Egil Dahlberg
* bmk/megaco/r15b02_cleanup/OTP-10199: Prep for R15B02 release
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'jkl/erlsrv-graceful-shutdown/OTP-10228' into maintFredrik Gustafsson
* jkl/erlsrv-graceful-shutdown/OTP-10228: erlsrv: gracefully stop emulator on Windows shutdown
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'psi/fix-leap-seconds/OTP-10227' into maintFredrik Gustafsson
2012-08-27Merge branch 'maint'Siri Hansen
2012-08-27Maintain service_info callback data in process dictionaryAnders Svensson
To be used by diameter_service in constructing service_info.
2012-08-27Include transport-specific service infoAnders Svensson
2012-08-27Merge branch 'siri/reltool/slim_release/OTP-9743' into maintSiri Hansen
* siri/reltool/slim_release/OTP-9743: [reltool] Add documentation for option 'excl_lib' [reltool] Add option {excl_lib,otp_root}
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'mh/emacs-test-indentation/OTP-10226' into maintFredrik Gustafsson
* mh/emacs-test-indentation/OTP-10226: Add test_indentation target to lib/tools/emacs/Makefile
2012-08-27Merge branch 'pgö/observer-edit-table-row/OTP-10225' into maintFredrik Gustafsson
Conflicts: lib/observer/src/observer_tv_table.erl
2012-08-27Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssl: Fixed compilation warnings Corrected decoding to encorse a proper error return is there is tag mismatch
2012-08-27Merge branch 'ia/ssl-compilation-warnings' into maintIngela Anderton Andin
* ia/ssl-compilation-warnings: ssl: Fixed compilation warnings
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27ssl: Fixed compilation warningsIngela Anderton Andin
2012-08-27Merge branch 'kenneth/asn1/error_tag_mismatch/OTP-10186' into maintKenneth Lundin
* kenneth/asn1/error_tag_mismatch/OTP-10186: Corrected decoding to encorse a proper error return is there is tag mismatch OTP-10186
2012-08-27Merge branch 'pgö/observer-edit-table-row/OTP-10225' into maintFredrik Gustafsson
* pgö/observer-edit-table-row/OTP-10225: Make Table Viewer search a bit faster Edit table row in a multiline text dialog Conflicts: lib/observer/src/observer_tv_table.erl
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'master' of super:otpFredrik Gustafsson
2012-08-27Merge branch 'sze/ssh-auth_methods/OTP-10224' into maintFredrik Gustafsson
* sze/ssh-auth_methods/OTP-10224: Corrected some documentation according to original SSH: Make "auth_methods" server option re-usable
2012-08-27Merge remote branch 'upstream/maint'Peter Andersson
2012-08-27Merge remote branch 'origin/peppe/common_test/misc_test_failures' into maintPeter Andersson
* origin/peppe/common_test/misc_test_failures: Solve problem with registering parallel testcases
2012-08-27Merge remote branch 'origin/peppe/common_test/bad_func_spec' into maintPeter Andersson
* origin/peppe/common_test/bad_func_spec: Fix error in function specification
2012-08-27Merge remote branch 'origin/peppe/common_test/silent_connection_testspec' ↵Peter Andersson
into maint * origin/peppe/common_test/silent_connection_testspec: Add silent_connections term to test specification
2012-08-27Merge remote branch 'upstream/maint' into maintPeter Andersson
2012-08-27Fix dialyzer warning for hipe_bifs:remove_refs_from(all)Sverker Eriksson
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'pg/fix-zip-multidisk/OTP-10223' into maintFredrik Gustafsson
* pg/fix-zip-multidisk/OTP-10223: Fix bug where zip archives wrongly have a first disk number set to 1
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'pg/fix-zip-multidisk/OTP-10223' into maintFredrik Gustafsson
* pg/fix-zip-multidisk/OTP-10223: Fix bug where zip archives wrongly have a first disk number set to 1
2012-08-27Update preloadedLukas Larsson
2012-08-27Merge branch 'maint'Lukas Larsson
* maint: Bumped version nr ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur. Add more cross reference links to ct docs Remove config option from common_test args Update user config to use nested tuple keys Allow mixed IPv4 and IPv6 addresses to sctp_bindx Add checks for in6addr_any and in6addr_loopback Fix SCTP multihoming observer: fix app file (Noticed-by: Motiejus Jakstys) Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos Prevent index from being corrupted if a nonexistent item is deleted Add tests showing that trying to delete non-existing object may corrupt the table index Fix Table Viewer search crash on new|changed|deleted rows Escape control characters in Table Viewer Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence inet_drv.c: Set sockaddr lengths in inet_set_[f]address Conflicts: erts/preloaded/ebin/prim_inet.beam
2012-08-27Merge branch 'lukas/common_test/deep_get_config/OTP-9626' into maintLukas Larsson
* lukas/common_test/deep_get_config/OTP-9626: Add more cross reference links to ct docs Remove config option from common_test args Update user config to use nested tuple keys
2012-08-27Merge branch 'ia/ssl/countryname-utf8-workaround/OTP-10222' into maintIngela Anderton Andin
* ia/ssl/countryname-utf8-workaround/OTP-10222: ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur.
2012-08-27Merge branch 'bp/fix_mnesia_index_drop/OTP-10220' into maintFredrik Gustafsson
* bp/fix_mnesia_index_drop/OTP-10220: Bumped version nr Prevent index from being corrupted if a nonexistent item is deleted Add tests showing that trying to delete non-existing object may corrupt the table index
2012-08-27Bumped version nrFredrik Gustafsson
2012-08-27Merge branch 'ta/observer-app/OTP-10221' into maintFredrik Gustafsson
* ta/observer-app/OTP-10221: observer: fix app file (Noticed-by: Motiejus Jakstys)
2012-08-27Merge branch 'kr/r15_ssh_test_ipv6_fix/OTP-10219' into maintFredrik Gustafsson
* kr/r15_ssh_test_ipv6_fix/OTP-10219: Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos
2012-08-27Merge branch 'pgö/escape-control-chars-tv/OTP-10218' into maintFredrik Gustafsson
* pgö/escape-control-chars-tv/OTP-10218: Fix Table Viewer search crash on new|changed|deleted rows Escape control characters in Table Viewer Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence
2012-08-27Merge branch 'tab/fix-sctp-multihoming-IPv6/OTP-10217' into maintFredrik Gustafsson
* tab/fix-sctp-multihoming-IPv6/OTP-10217: Allow mixed IPv4 and IPv6 addresses to sctp_bindx Add checks for in6addr_any and in6addr_loopback Fix SCTP multihoming inet_drv.c: Set sockaddr lengths in inet_set_[f]address
2012-08-27Maintain pid of started transport process in process dictionaryAnders Svensson
2012-08-27Merge branch 'maint'Björn Gustavsson
* maint: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27Merge branch 'bjorn/otp/fix-make_preload/OTP-10201' into maintBjörn Gustavsson
* bjorn/otp/fix-make_preload/OTP-10201: make_preload: Don't fail if Perl's default file encoding is UTF-8