summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | BER: Test decoding of indefinite lengthsBjörn Gustavsson2014-08-111-0/+51
* | | | | | Merge branch 'lucafavatella/improve-cpu_sup-error-when-slow-port-init' into m...Marcus Arendt2014-09-081-5/+7
|\ \ \ \ \ \
| * | | | | | Clarify error for slow `cpu_sup` port initLuca Favatella2014-08-291-5/+7
* | | | | | | Merge branch 'rickard/memory_consuming_tuple_tests' into maintRickard Green2014-09-051-20/+75
|\ \ \ \ \ \ \
| * | | | | | | Only run upper boundry tuple test with lots of memoryRickard Green2014-09-051-20/+75
* | | | | | | | Merge branch 'vinoski/enif-schedule-nif' into maintRickard Green2014-09-054-6/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix leak of NIF exportsRickard Green2014-09-051-0/+5
| * | | | | | | | Use separate allocation type for NIF exportRickard Green2014-09-053-6/+21
* | | | | | | | | Merge branch 'hans/common_test/Makefile_fix' into maintHans Nilsson2014-09-051-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | common_test: update Makefile for ct_property_test module.Hans Nilsson2014-09-051-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ia/public_key/utf8-doc' into maintIngela Anderton Andin2014-09-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | public_key: Correct documentation of ASN-1 type utf8StringIngela Anderton Andin2014-09-051-1/+1
* | | | | | | | | | Merge branch 'maint' of git-server:otp into maintIngela Anderton Andin2014-09-0515-62/+151
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'sverk/term_to_binary-realloc-size/OTP-12141' into maintSverker Eriksson2014-09-041-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | erts: Fix bug in term_to_binary that reallocates binary with wrong sizeSverker Eriksson2014-09-031-0/+2
| * | | | | | | | | | Merge branch 'sverk/MIN_SMALL-to-integer' into maintSverker Eriksson2014-09-043-28/+28
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | erts: Correct conversion of MIN_SMALL numeral to fixnumSverker Eriksson2014-09-043-28/+28
| * | | | | | | | | | | Merge branch 'sverk/nif-inspect-copy-bug/OTP-9828' into maintSverker Eriksson2014-09-044-3/+54
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | erts: Fix bug with enif_make_copy reallocating writable binarySverker Eriksson2014-09-034-3/+54
| * | | | | | | | | | | | Merge branch 'egil/fix-llvm-cc-warnings/OTP-12138' into maintBjörn-Egil Dahlberg2014-09-045-20/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | odbc: Suppress signedness warnings for 'char *'Björn-Egil Dahlberg2014-07-152-10/+13
| | * | | | | | | | | | | | ic: Suppress unused-value warningBjörn-Egil Dahlberg2014-06-241-1/+1
| | * | | | | | | | | | | | erts: Fix tentative-definition-incomplete-typeBjörn-Egil Dahlberg2014-06-241-9/+10
| | * | | | | | | | | | | | erts: Don't redefine '_XOPEN_SOURCE'Björn-Egil Dahlberg2014-06-241-0/+4
| * | | | | | | | | | | | | Merge branch 'egil/maps-with-doc-tests/OTP-12137' into maintBjörn-Egil Dahlberg2014-09-042-11/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | stdlib: Test maps:with/2Björn-Egil Dahlberg2014-08-261-11/+22
| * | | | | | | | | | | | | stdlib: Document maps:with/2Björn-Egil Dahlberg2014-08-261-0/+17
* | | | | | | | | | | | | | Merge branch 'arekinath/ssh/aes-ctr' into maintMarcus Arendt2014-09-033-16/+202
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ssh: check if ssh client supports newer cipher- and MAC-algorithmsMarcus Arendt2014-09-021-0/+28
| * | | | | | | | | | | | | | SSH: only enable ciphers/MACs when they are available in cryptoAlex Wilson2014-08-282-15/+35
| * | | | | | | | | | | | | | SSH: add ssh_to_openssh test for ciphers and macsAlex Wilson2014-08-181-1/+99
| * | | | | | | | | | | | | | SSH: documentation update for new algosAlex Wilson2014-08-011-2/+2
| * | | | | | | | | | | | | | SSH: add support for aes128-ctr and hmac-sha2-256Alex Wilson2014-06-101-13/+53
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'hans/update_vsn.mk' into maintHans Nilsson2014-09-033-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ssh: update vsn.mkHans Nilsson2014-09-031-1/+1
| * | | | | | | | | | | | | | inets: update vsn.mkHans Nilsson2014-09-031-1/+1
| * | | | | | | | | | | | | | common_test: update vsn.mkHans Nilsson2014-09-031-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'hans/proptest/init/OTP-12119' into maintHans Nilsson2014-09-0218-0/+1816
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | ssh: Add simple experimental property test suitesHans Nilsson2014-09-0211-0/+1240
| * | | | | | | | | | | | | inets: Add simple experimental property test suiteHans Nilsson2014-09-024-0/+396
| * | | | | | | | | | | | | common_test: Add experimental module ct_property_testHans Nilsson2014-09-023-0/+180
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Update primary bootstrapBjörn Gustavsson2014-09-0120-5/+5
* | | | | | | | | | | | | Merge branch 'bjorn/compiler/fix-scope-bug/OTP-12132' into maintBjörn Gustavsson2014-09-011-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sys_core_fold: Eliminate name capture bugBjörn Gustavsson2014-09-011-7/+7
* | | | | | | | | | | | | | Merge branch 'nox/erl_scan-fix-column-tracking' into maintMarcus Arendt2014-09-012-104/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Properly track column numbers in erl_scanAnthony Ramine2014-06-162-104/+146
* | | | | | | | | | | | | | Merge branch 'siri/ct-runtime-deps/OTP-12037' into maintSiri Hansen2014-09-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [ct] Update runtime dependencies towards test_serverSiri Hansen2014-07-111-2/+2
* | | | | | | | | | | | | | | Merge branch 'maint-17' into maintMarcus Arendt2014-09-014-10/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Updated OTP versionOTP-17.2.2Erlang/OTP2014-08-292-1/+2