aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-03-13Merge branch 'maint'Fredrik Gustafsson
2013-03-13Merge branch 'mh/supervisor-doc/OTP-10938' into maintFredrik Gustafsson
* mh/supervisor-doc/OTP-10938: Delete obsolete note about simple-one-for-one supervisor
2013-03-13Merge remote branch 'upstream/maint'Ingela Anderton Andin
2013-03-13Merge branch 'ia/public_key/ISO-oids/OTP-10873' into maintIngela Anderton Andin
* ia/public_key/ISO-oids/OTP-10873: public_key & ssl: Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27
2013-03-13public_key & ssl: Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27Ingela Anderton Andin
Some certificates may use these OIDs instead of the ones defined by PKIX/PKCS standard. Refactor code so that all handling of the "duplicate" oids is done by public_key. Update algorithm information in documentation.
2013-03-13Merge branch 'maint'Fredrik Gustafsson
2013-03-13Merge branch 'cm/bug-http-content-length-zero/OTP-10934' into maintFredrik Gustafsson
* cm/bug-http-content-length-zero/OTP-10934: Fix http_request:http_headers/1 to send content-length when length is zero
2013-03-13Merge branch 'maint'Fredrik Gustafsson
2013-03-13Merge branch 'fredrik/inets/header-error' into maintFredrik Gustafsson
* fredrik/inets/header-error: Added guard for invalid field and values in headers
2013-03-13Merge remote branch 'upstream/maint'Ingela Anderton Andin
2013-03-13Merge branch 'ia/ssl/test-maint' into maintIngela Anderton Andin
* ia/ssl/test-maint: ssl: Add missing configuration in test case
2013-03-13ssl: Add missing configuration in test caseIngela Anderton Andin
2013-03-12Merge branch 'maint'Björn-Egil Dahlberg
2013-03-12Merge branch 'egil/kernel/application-ensure_started/OTP-10910' into maintBjörn-Egil Dahlberg
* egil/kernel/application-ensure_started/OTP-10910: kernel: Document application:ensure_started/1,2 tests: Refactor away ?line macro in test suite kernel: Tests for application:ensure_started/1,2 kernel: Add application:ensure_started/1,2
2013-03-12Merge branch 'maint'Hans Bolinder
* maint: [debugger] Add an option 'Strings' stdlib: Remove race in ets_SUITE:delete_large_tab stdlib: Remove race in ets_SUITE:delete_large_named_table
2013-03-12Added guard for invalid field and values in headersFredrik Gustafsson
2013-03-12Merge branch 'hb/debugger/strings/OTP-10899' into maintHans Bolinder
* hb/debugger/strings/OTP-10899: [debugger] Add an option 'Strings'
2013-03-12Merge branch 'sverk/test-cuddling' into maintSverker Eriksson
* sverk/test-cuddling: stdlib: Remove race in ets_SUITE:delete_large_tab stdlib: Remove race in ets_SUITE:delete_large_named_table
2013-03-12Merge branch 'maint'Fredrik Gustafsson
2013-03-12Merge branch 'fredrik/ic_make_ji/OTP-10876' into maintFredrik Gustafsson
* fredrik/ic_make_ji/OTP-10876: String instead of atom, not_found handled by ts:make Checking if jinterface is present
2013-03-12Merge branch 'maint'Fredrik Gustafsson
2013-03-12Merge branch 'ats/observer_tv_improper_lists/OTP-10931' into maintFredrik Gustafsson
* ats/observer_tv_improper_lists/OTP-10931: Fix observer table viewer crash on formatting improper lists
2013-03-12Merge branch 'maint'Fredrik Gustafsson
2013-03-12Merge branch 'mh/fix-emacs-pkg-flymake-dep/OTP-10930' into maintFredrik Gustafsson
* mh/fix-emacs-pkg-flymake-dep/OTP-10930: Remove Flymake dependency in erlang-pkg.el
2013-03-12Merge branch 'maint'Fredrik Gustafsson
2013-03-12Merge branch 'mh/cdv-osx-default-browser/OTP-10929' into maintFredrik Gustafsson
* mh/cdv-osx-default-browser/OTP-10929: Added open on mac os to doc Use "open" as default browser for crashdump viewer on Mac OS X
2013-03-11Added open on mac os to docFredrik Gustafsson
2013-03-11String instead of atom, not_found handled by ts:makeFredrik Gustafsson
2013-03-11Merge branch 'maint'Fredrik Gustafsson
2013-03-11Merge branch 'maint-r16' into maintFredrik Gustafsson
Conflicts: lib/ssh/src/ssh.appup.src lib/ssh/test/ssh_sftp_SUITE.erl
2013-03-11Merge branch 'maint'Lukas Larsson
* maint: Update copyright notice [test_server] Remove unused code related to remote targets
2013-03-11Update copyright noticeLukas Larsson
2013-03-11Merge branch 'siri/test_server/remove-unused-code/OTP-10607' into maintSiri Hansen
* siri/test_server/remove-unused-code/OTP-10607: [test_server] Remove unused code related to remote targets
2013-03-08Delete obsolete note about simple-one-for-one supervisorMagnus Henoch
Since commit 47759479146ca11ad81eca0bb3236b265e20601d, simple-one-for-one supervisors _do_ kill their children explicitly on shutdown. That commit also removed this note, but it seems like the merge commit 45b4d5309e0686cc5fa28506de76f75b598bbd95 incorrectly reinstated it.
2013-03-08Checking if jinterface is presentFredrik Gustafsson
2013-03-08kernel: Document application:ensure_started/1,2Björn-Egil Dahlberg
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed appup for 2.1.5 Conflicts: lib/ssh/src/ssh.appup.src
2013-03-08Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into ↵Erlang/OTP
maint-r16 * ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714: ssh: Prepare for upcoming release ssh: Test and enhance handling of nonexistent subsystem Prepare release Fixed rekeying initiation and secured testcase
2013-03-08Merge branch 'sverk/erl_interface-trailing-enum-comma' into maint-r16Erlang/OTP
* sverk/erl_interface-trailing-enum-comma: erl_interface: Remove superfluous comma in enum erlang_char_encoding
2013-03-08ssh: Prepare for upcoming releaseIngela Anderton Andin
Note: If more things are added before the next releas the appup will need more updates.
2013-03-08ssh: Test and enhance handling of nonexistent subsystemIngela Anderton Andin
2013-03-08Fixed appup for 2.1.5Fredrik Gustafsson
2013-03-08Merge branch 'maint'Fredrik Gustafsson
2013-03-08Merge branch 'fredrik/inets/httpc_length_zero' into maintFredrik Gustafsson
* fredrik/inets/httpc_length_zero: Removed case clause for length = 0 for both HTTP1.0 and HTTP1.1
2013-03-08Merge branch 'maint'Fredrik Gustafsson
2013-03-08Merge branch 'ta/docs-16b' into maintFredrik Gustafsson
* ta/docs-16b: Fix gen_fsm example code Fix doc typos for R16B01
2013-03-08Merge branch 'maint'Fredrik Gustafsson
2013-03-08Merge branch 'mh/dialyzer-overlapping-warning/OTP-10918' into maintFredrik Gustafsson
* mh/dialyzer-overlapping-warning/OTP-10918: Include module, function and arity in Dialyzer's "overlapping domain" warnings
2013-03-08Prepare releaseErlang/OTP
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed rekeying initiation and secured testcase
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 11:19:08 +0000