aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-28Remove Dialyzer warningsKenneth Lundin
2012-08-28ssh: Correct error handling of ssh connectIngela Anderton Andin
2012-08-28Merge remote branch 'upstream/maint'Peter Andersson
2012-08-28Merge remote branch 'origin/peppe/common_test/break_cont_error' into maintPeter Andersson
* origin/peppe/common_test/break_cont_error: Make sure the test can never hang when ct:break/1/2 is called
2012-08-28ssh: Use the correct channel id when adjusting the channel windowIngela Anderton Andin
2012-08-28Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssh: Correct dialyzer specs
2012-08-28Merge branch 'ia/ssh/dialyzer' into maintIngela Anderton Andin
* ia/ssh/dialyzer: ssh: Correct dialyzer specs
2012-08-28[common_test] Change server address from localhost to 127.0.0.1 in netconf ↵Siri Hansen
config Tests failed with ehostunreach on some hosts since localhost could not be resolved. CT configuration file for tests of ct_netconfc is now changed to use 127.0.0.1 instead.
2012-08-28Make sure that turning off local trace does not turn off global traceBjörn Gustavsson
Attempting to turn off local call trace when there was global call trace enabled would incorrectly turn off the global call trace. This bug was introduced in bf5bf8b93dccca86c4775b21ee0db49eb6a3b133.
2012-08-28Merge branch 'maint'Fredrik Gustafsson
2012-08-28Merge branch 'ks/dialyzer-R15B02-final-fixes/OTP-10231' into maintFredrik Gustafsson
* ks/dialyzer-R15B02-final-fixes/OTP-10231: Stop a forgotten server process Changes to fix warnings identified by running dialyzer -Wunmatched_returns
2012-08-28Merge branch 'maint'Fredrik Gustafsson
2012-08-28Merge branch 'ks/hipe-R15B02-fixes/OTP-10230' into maintFredrik Gustafsson
* ks/hipe-R15B02-fixes/OTP-10230: Changes in comments and minor code cleanups Comment out unused cases and some csmetic cleanups. Fix a typo and strengthen some type declarations Remove unused imports Add a missing tag in a type declaration
2012-08-28erl_bif_trace: Remove an unused variableBjörn Gustavsson
2012-08-28Tweak info presentationAnders Svensson
2012-08-28Fix missing transport service_info when there are no watchdogsAnders Svensson
2012-08-27erts: Fix dtrace-bug in file rename opSverker Eriksson
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 15:15:35 +0000