aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-30Merge remote branch 'upstream/maint'Peter Andersson
2012-08-30Merge remote branch 'origin/peppe/common_test/documentation_r15b02.2' into maintPeter Andersson
* origin/peppe/common_test/documentation_r15b02.2: Update the documentation for R15B02 OTP-10050 OTP-10069 OTP-10072 OTP-10087 OTP-9865 OTP-10049 OTP-10089 OTP-10145 OTP-9896 OTP-10135 OTP-10067 OTP-9625 OTP-10127 OTP-10172 OTP-10248 OTP-9625 OTP-10086 OTP-10248
2012-08-30Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssh: Increase robustness inets: Dialyzer spec fixes
2012-08-30Merge branch 'ia/ssh/ignore-incorrect-lines-in-auth_keys-and-known_hosts' ↵Ingela Anderton Andin
into maint * ia/ssh/ignore-incorrect-lines-in-auth_keys-and-known_hosts: ssh: Increase robustness
2012-08-30Merge branch 'ia/inets-dialyzer' into maintIngela Anderton Andin
* ia/inets-dialyzer: inets: Dialyzer spec fixes
2012-08-29ssh: Increase robustnessIngela Anderton Andin
If a line of single line of the authorized_key file och known_hosts file is incorrectly formated ignore it.
2012-08-29inets: Dialyzer spec fixesIngela Anderton Andin
2012-08-29Update the documentation for R15B02Peter Andersson
OTP-10050 OTP-10069 OTP-10072 OTP-10087 OTP-9865 OTP-10049 OTP-10089 OTP-10145 OTP-9896 OTP-10135 OTP-10067 OTP-9625 OTP-10127 OTP-10172 OTP-10248 OTP-9625 OTP-10086
2012-08-29Merge branch 'maint'Anders Svensson
2012-08-29Merge branch 'anders/diameter/service_info/OTP-10213' into maintAnders Svensson
* anders/diameter/service_info/OTP-10213: Minor counting fix Tweak info presentation Fix missing transport service_info when there are no watchdogs
2012-08-29Merge branch 'maint'Anders Svensson
2012-08-29Merge branch 'maint'Sverker Eriksson
2012-08-29Merge branch 'anders/diameter/multiple_transport_modules/OTP-9885' into maintAnders Svensson
* anders/diameter/multiple_transport_modules/OTP-9885: Dialyzer spec fixes
2012-08-29Merge branch 'anders/diameter/R15B02_release' into maintAnders Svensson
* anders/diameter/R15B02_release: Dialyzer spec fix Learn to keep time in diameter_gen_sctp_SUITE Update command line test for changed ct:run_test/1 return value OTP-10243
2012-08-29Merge branch 'sverk/port-data-lock-bug' into maintSverker Eriksson
* sverk/port-data-lock-bug: Fix premature deallocation bug of port data lock
2012-08-29Merge branch 'maint'Henrik Nord
Conflicts: README.md
2012-08-29Merge branch 'yt/faqurl' into maintHenrik Nord
* yt/faqurl: Update a URL OTP-10246
2012-08-29Merge branch 'maint'Henrik Nord
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 'maint'Sverker Eriksson
Conflicts: lib/hipe/cerl/erl_bif_types.erl
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-29Dialyzer spec fixesAnders Svensson
2012-08-29Merge branch 'maint'Siri Hansen
2012-08-29Dialyzer spec fixAnders Svensson
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-29Learn to keep time in diameter_gen_sctp_SUITEAnders Svensson
Microseconds /= milliseconds.
2012-08-29Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssh: Prepare for release ssh: Correct error handling of ssh connect ssh: Use the correct channel id when adjusting the channel window
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-29Merge branch 'maint'Fredrik Gustafsson
2012-08-29Used previous resolutionFredrik Gustafsson
2012-08-28Minor counting fixAnders Svensson
2012-08-28Fix premature deallocation bug of port data lockSverker Eriksson
Release port data lock *after* "async_ready" or "free" callback has been called.
2012-08-28Update command line test for changed ct:run_test/1 return valueAnders Svensson
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 'maint'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 'maint'Anders Svensson
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:47:34 +0000