aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-29Merge branch 'ta/docsmaint' into maintHenrik Nord
* ta/docsmaint: Fix various doc typos for R15B02 Fix various code typos for R15B02 OTP-10245
2012-08-29Merge branch 'sverk/dialyzer-warnings' into maintSverker Eriksson
* sverk/dialyzer-warnings: Fix dialyzer warning for erlang:statistics(scheduler_wall_time) Fix dialyzer warning for system_flag(scheduler_wall_time) Fix dialyzer warning for hipe_bifs:remove_refs_from(all)
2012-08-29Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Change server address from localhost to 127.0.0.1 in netconf config [common_test] Fix timing dependent bugs in test for ct_netconfc
2012-08-29Merge branch 'ia/ssh/prepare-for-release' into maintIngela Anderton Andin
* ia/ssh/prepare-for-release: ssh: Prepare for release
2012-08-29Merge branch 'ia/ssh/connection-start-error-handling' into maintIngela Anderton Andin
* ia/ssh/connection-start-error-handling: ssh: Correct error handling of ssh connect
2012-08-29Merge branch 'ia/ssh/adjust-window-remote-id/OTP-10232' into maintIngela Anderton Andin
* ia/ssh/adjust-window-remote-id/OTP-10232: ssh: Use the correct channel id when adjusting the channel window
2012-08-29Used previous resolutionFredrik Gustafsson
2012-08-28Fix dialyzer warning for erlang:statistics(scheduler_wall_time)Sverker Eriksson
2012-08-28Fix dialyzer warning for system_flag(scheduler_wall_time)Sverker Eriksson
2012-08-28Merge branch 'sverk/dtrace-file-rename-bug' into maintSverker Eriksson
* sverk/dtrace-file-rename-bug: erts: Fix dtrace-bug in file rename op OTP-10234
2012-08-28Merge branch 'anders/diameter/sctp_peeloff/OTP-9611' into maintAnders Svensson
* anders/diameter/sctp_peeloff/OTP-9611: Use gen_sctp:peeloff/2 to transfer association ownership
2012-08-28Merge branch 'anders/diameter/callback_isolation/OTP-10215' into maintAnders Svensson
* anders/diameter/callback_isolation/OTP-10215: Don't let peer_up/peer_down take down the service process Turn last field of #diameter_app{} into an options list
2012-08-28Merge branch 'anders/diameter/test_suites/OTP-10214' into maintAnders Svensson
* anders/diameter/test_suites/OTP-10214: Increase buffer sizes in gen_sctp suite Exercise service_info in test suites Lighten up on timetraps in test suites Fix timing issue with subscribe in test suites
2012-08-28Merge branch 'anders/diameter/service_info/OTP-10213' into maintAnders Svensson
* anders/diameter/service_info/OTP-10213: Include transport-specific service info Make service_info behave with nested item lists and non-atoms Add 'connections' and 'peers' service_info
2012-08-28Merge branch 'anders/diameter/watchdog_events/OTP-10212' into maintAnders Svensson
* anders/diameter/watchdog_events/OTP-10212: Minor spec fix Maintain watchdog states in service_info Add events for watchdog state transitions
2012-08-28Merge branch 'anders/diameter/statistics/OTP-9608' into maintAnders Svensson
* anders/diameter/statistics/OTP-9608: Improve statistics test cases Statistics fixes
2012-08-28Merge branch 'anders/diameter/capabilities_encode/OTP-10203' into maintAnders Svensson
* anders/diameter/capabilities_encode/OTP-10203: Deal with the fact that capabilities config may be incomplete
2012-08-28Merge branch 'anders/diameter/avp_errors/OTP-10202' into maintAnders Svensson
* anders/diameter/avp_errors/OTP-10202: Allow an answer to opt out of setting Result-Code/Failed-AVP Set Result-Code as an optional AVP in reply to request containing errors Fix Destination-Host/Realm extraction for arbitrary dictionaries Fix result code statistics for arbitrary dictionaries Count incoming answers containing AVP decode errors Fix counter typo Encode fix
2012-08-28Merge branch 'anders/diameter/multiple_transport_modules/OTP-9885' into maintAnders Svensson
* anders/diameter/multiple_transport_modules/OTP-9885: Maintain service_info callback data in process dictionary Maintain pid of started transport process in process dictionary Minor spec and backwards compatibility fix Update example code Update documentation Add diameter_transport for transport start indirection Allow multiple transport_module and transport_config
2012-08-28Merge branch 'anders/diameter/R15B02_release' into maintAnders Svensson
* anders/diameter/R15B02_release: Update appup Add plt/dialyze targets to src/Makefile Add realclean target to src/Makefile Add any target to test/Makefile vsn -> 1.2
2012-08-28Merge branch 'hw/asn1rt_check-transform' into maintHenrik Nord
* hw/asn1rt_check-transform: asn1rt_check: Fix transform_to_EXTERNAL1990 for binary input OTP-10233
2012-08-28ssh: Prepare for releaseIngela Anderton Andin
2012-08-28ssh: Correct error handling of ssh connectIngela Anderton Andin
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 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-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 '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-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 '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 '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 '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 'psi/fix-leap-seconds/OTP-10227' into maintFredrik Gustafsson
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 '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 branch 'ia/ssl-compilation-warnings' into maintIngela Anderton Andin
* ia/ssl-compilation-warnings: ssl: Fixed compilation warnings
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 '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 '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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:42:15 +0000