aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2013-09-17Merge tag 'OTP_R16B02'Magnus Lidén
The R16B02 release Conflicts: lib/sasl/vsn.mk
2013-09-16Prepare releaseOTP_R16B02Erlang/OTP
2013-09-13Merge branch 'maint'Anders Svensson
2013-09-13Merge branch 'anders/diameter/R16B02_release/OTP-11322' into maintAnders Svensson
* anders/diameter/R16B02_release/OTP-11322: vsn -> 1.4.3 Update appup for diameter-1.4.3 in R16B02
2013-09-13Merge branch 'maint'Björn-Egil Dahlberg
2013-09-12vsn -> 1.4.3Anders Svensson
2013-09-12megaco: Update appup fileBjörn-Egil Dahlberg
2013-09-12Update appup for diameter-1.4.3 in R16B02Anders Svensson
2013-09-12Merge branch 'maint'Peter Andersson
2013-09-11Make builtin hook respond to init:stopPeter Andersson
2013-09-11Merge branch 'maint'Peter Andersson
2013-09-11Merge branch 'peppe/common_test/misc_r16b02_docs' into maintPeter Andersson
* peppe/common_test/misc_r16b02_docs: Add misc documentation OTP-11272 OTP-11263 OTP-11244 OTP-11238 OTP-11176
2013-09-11Add misc documentationPeter Andersson
2013-09-11Merge branch 'maint'Fredrik Gustafsson
2013-09-10parsetools: added testcase for unicodeFredrik Gustafsson
2013-09-10Missed a few similar callsPierre Fenoll
2013-09-10Fix leex module`s inability to build unicode-aware lexers.Pierre Fenoll
If you have declared your .xrl file as utf-8 encoded and that some of your definitions contain unicode characters, either leex wouldn`t be able to lex them or compilation of the .xrl file would crash.
2013-09-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-10ssl: Prepare for releaseIngela Anderton Andin
2013-09-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-10Merge branch 'ia/ssl/dtls-refactor/OTP-11292' into maintIngela Anderton Andin
* ia/ssl/dtls-refactor/OTP-11292: ssl: Refactor TLS/DTLS record handling ssl: Dialyzer fixes ssl: Solve rebase issues ssl: DTLS record handling ssl: Add DTLS record primitives ssl: Refactor to provide common handshake functions for TLS/DTLS ssl: Add DTLS handshake primitivs.
2013-09-10ssl: Refactor TLS/DTLS record handlingIngela Anderton Andin
2013-09-10ssl: Dialyzer fixesIngela Anderton Andin
2013-09-10ssl: Solve rebase issuesIngela Anderton Andin
2013-09-10ssl: DTLS record handlingIngela Anderton Andin
Also refactor so that TLS and DTLS can have common functions when possible.
2013-09-10ssl: Add DTLS record primitivesAndreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-10ssl: Refactor to provide common handshake functions for TLS/DTLSIngela Anderton Andin
Common functions will be located in ssl_handshake.erl while specific functions will be located in tls_handshake.erl and dtls_handshake.erl
2013-09-10ssl: Add DTLS handshake primitivs.Andreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-09Merge branch 'maint'Björn Gustavsson
* maint: core_lint: Correct the type error() to conform to the code
2013-09-09core_lint: Correct the type error() to conform to the codeBjörn Gustavsson
Commit 60984ade updated the code, but not the type spec. Noticed-by: Kostis Sagonas
2013-09-09Merge branch 'maint'Björn Gustavsson
* maint: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
2013-09-09Merge branch 'bjorn/xml-encoding-fix/OTP-11310' into maintBjörn Gustavsson
* bjorn/xml-encoding-fix/OTP-11310: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
2013-09-09Merge branch 'maint'Björn-Egil Dahlberg
2013-09-09Merge branch 'kenneth/doc_to_dtd/OTP-11193' into maintBjörn-Egil Dahlberg
* kenneth/doc_to_dtd/OTP-11193: Corrections so that the documentation confirms to the DTD Minor correction of xml structure to conform to the DTD
2013-09-09Merge branch 'maint'Anders Svensson
2013-09-09Merge branch 'anders/diameter/spawn_opt/OTP-11299' into maintAnders Svensson
* anders/diameter/spawn_opt/OTP-11299: Fix broken spawn_opt
2013-09-09Merge branch 'anders/diameter/failed_avp/OTP-11293' into maintAnders Svensson
* anders/diameter/failed_avp/OTP-11293: Fix Failed-AVP construction for CEA/DWA/DPA
2013-09-09Merge branch 'maint'Micael Karlberg
2013-09-09Merge branch 'bmk/snmp/agent/improve_load_unload_mibs_if/OTP-11216' into maintMicael Karlberg
2013-09-09Merge branch 'maint'Björn Gustavsson
* maint: compiler: Conform returned errors to the documented format
2013-09-09Merge branch 'bjorn/compiler/return_errors/OTP-11304' into maintBjörn Gustavsson
* bjorn/compiler/return_errors/OTP-11304: compiler: Conform returned errors to the documented format
2013-09-09Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
2013-09-09Merge branch 'ks/hipe_unified_loader-cleanup/OTP-11301' into maintFredrik Gustafsson
* ks/hipe_unified_loader-cleanup/OTP-11301: Updated primary bootstrap Cleanup of the file
2013-09-06Merge branch 'maint'Fredrik Gustafsson
2013-09-06Merge branch 'dotsimon/os_mon_cpu_sup_solaris64/OTP-11298' into maintFredrik Gustafsson
* dotsimon/os_mon_cpu_sup_solaris64/OTP-11298: Fix broken cpu_sup:nprocs and others on Solaris 64-bit Fix some compiler warnings Remove object files when cleaning
2013-09-06Merge branch 'maint'Lukas Larsson
* maint: Ignore odbc cores Cross compilation is now a supported feature
2013-09-06Merge branch 'lukas/r16b02/docfixes' into maintLukas Larsson
* lukas/r16b02/docfixes: Ignore odbc cores Cross compilation is now a supported feature
2013-09-06Change encoding of troublesome notes.xml files to utf-8Björn Gustavsson
Most notes.xml files will be updated in every release and cause the kind of the problems described in the previous commit.
2013-09-06Convert some notes.xml files from latin-1 to utf-8Björn Gustavsson
In the master branch, the encoding for most xml files have been changed from latin-1 to utf-8. The problem is, that the corresponding files in the maint branch still are encoded in latin-1, and that a merge from maint to master may bring in characters encoded in latin-1 into a notes.xml file declared to be in utf-8. To fix the problem once and for all (for the files involved), we'll need to re-encode the files files utf-8 in maint, and then merge to master. Noticed-by: Magnus Henoch
2013-09-06Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/stdlib/ebin/erl_lint.beam
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 03:22:32 +0000