aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-02-16Merge branch 'maint'Henrik Nord
2012-02-16Merge branch 'ahs/fix-gb_trees-doc' into maintHenrik Nord
* ahs/fix-gb_trees-doc: Put gb_trees documentation into alphabetical order OTP-9929
2012-02-16Merge branch 'maint'Henrik Nord
Conflicts: lib/hipe/cerl/erl_bif_types.erl lib/stdlib/doc/src/binary.xml
2012-02-16Merge branch 'vd/jinterface-atom-message' into maintHenrik Nord
* vd/jinterface-atom-message: Improve error message when creating a too long OtpErlangAtom OTP-9928
2012-02-16Merge branch 'vd/java-string-bug' into maintHenrik Nord
* vd/java-string-bug: add test for Java string bug workaround for Java bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6242664 OTP-9927
2012-02-16Merge branch 'jz/erts-remove-unused-var' into maintHenrik Nord
* jz/erts-remove-unused-var: erts: Remove unused variable OTP-9926
2012-02-16Merge branch 'rc/spell-registered' into maintHenrik Nord
* rc/spell-registered: Correct spelling of "registered" in various places in the source code OTP-9925
2012-02-16Merge branch 'rj/fix-sup-doc-typo' into maintHenrik Nord
* rj/fix-sup-doc-typo: Fix typo in supervisor behaviour doc OTP-9924
2012-02-16Merge branch 'ts/extend-specs-for-bifs' into maintHenrik Nord
* ts/extend-specs-for-bifs: Make dialyzer recognize the process_flag option sensitive OTP-9923
2012-02-16Merge branch 'rj/fix-binary-doc-spec' into maintHenrik Nord
* rj/fix-binary-doc-spec: Fix the type spec from the doc of binary:part/3 OTP-9920
2012-02-16Merge branch 'rj/fix-compile-doc-typo' into maintHenrik Nord
* rj/fix-compile-doc-typo: Fix typo in `compile' doc: unmatched parenthesis OTP-9919
2012-02-16Merge branch 'rj/doc-monospace-css' into maintHenrik Nord
* rj/doc-monospace-css: Set `font-family: Courier, monospace' in OTP doc CSS OTP-9918
2012-02-16Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Document user_dir for the server
2012-02-16Merge branch 'ia/ssh/server-user-dir-doc' into maintIngela Anderton Andin
* ia/ssh/server-user-dir-doc: Document user_dir for the server
2012-02-16Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Remove unused files from test data as it is confusing Add support for key files protected by pass phrases
2012-02-16Merge branch 'ia/ssh/pass-phrase-protected-keys/OTP-6400' into maintIngela Anderton Andin
* ia/ssh/pass-phrase-protected-keys/OTP-6400: Remove unused files from test data as it is confusing Add support for key files protected by pass phrases
2012-02-15Remove unused files from test data as it is confusingIngela Anderton Andin
2012-02-15Add support for key files protected by pass phrasesIngela Anderton Andin
2012-02-14Document user_dir for the serverIngela Anderton Andin
2012-02-14Merge branch 'maint'Ingela Anderton Andin
* maint: Client now honors the allow_user_interaction option Avoid to crash if the remote side closes the connection prematurely
2012-02-14Merge branch 'ia/ssh/crash-report-with-impatient-SFTP-client/OTP-9391' into ↵Ingela Anderton Andin
maint * ia/ssh/crash-report-with-impatient-SFTP-client/OTP-9391: Avoid to crash if the remote side closes the connection prematurely
2012-02-14Merge branch 'ia/ssh/keyboard-interactive-disable-bug/OTP-9466' into maintIngela Anderton Andin
* ia/ssh/keyboard-interactive-disable-bug/OTP-9466: Client now honors the allow_user_interaction option
2012-02-14Merge branch 'maint'Gustav Simonsson
2012-02-14Merge branch 'gustav/ssh/ssh-key-callback-specs' into maintGustav Simonsson
* gustav/ssh/ssh-key-callback-specs: Add behaviour (api) module with callback specs
2012-02-14Merge branch 'gustav/orber/fix-dbg-printout-format/OTP-9887' into maintGustav Simonsson
* gustav/orber/fix-dbg-printout-format/OTP-9887: Add parameter to error message string format
2012-02-14Merge branch 'gustav/sasl_release_handler_file_bugfix/OTP-9864' into maintGustav Simonsson
* gustav/sasl_release_handler_file_bugfix/OTP-9864: Fix so remove_release can remove symlinks
2012-02-14Merge branch 'maint'Henrik Nord
2012-02-14Merge branch 'pg/fix-ssl_tls_dist_proxy-setup-loop' into maintHenrik Nord
* pg/fix-ssl_tls_dist_proxy-setup-loop: Fix setup loop of SSL TLS dist proxy OTP-9915 OTP-9916
2012-02-14Merge branch 'pg/ssl_dist-fixes' into maintHenrik Nord
* pg/ssl_dist-fixes: Robustness and improvement to distribution over SSL
2012-02-14Robustness and improvement to distribution over SSLPaul Guyot
Fix a bug where the caller would timeout and ssl_tls_dist_proxy would crash. Fix a bug where a timeout from the SSL layer would block the distribution forever (typically when a non-SSL node tries to connect to an SSL node). Add this very case as a test (test_server tries to connect to SSL nodes). Run the proxy exclusively on the loopback interface.
2012-02-14Merge branch 'ws/erl-xcomp-avr32' into maintHenrik Nord
* ws/erl-xcomp-avr32: Update xcomp config for AVR32/buildroot-v3.0.0 OTP-9914
2012-02-14Merge branch 'av/maint-memsup' into maintHenrik Nord
* av/maint-memsup: Fix segmentation fault in memsup OTP-9913
2012-02-14Merge branch 'jz/reduce-smp-locking-time-range' into maintHenrik Nord
* jz/reduce-smp-locking-time-range: erts: reduce smp locking time range in erts_garbage_collect OTP-9912
2012-02-13Merge branch 'maint'Björn Gustavsson
* maint: Include the xmerl include files in the bootstrap Teach lib/Makefile to build applications listed in EXTRA-APPLICATIONS Clean up lib/Makefile
2012-02-13Merge branch 'bjorn/makefiles' into maintBjörn Gustavsson
* bjorn/makefiles: Include the xmerl include files in the bootstrap Teach lib/Makefile to build applications listed in EXTRA-APPLICATIONS Clean up lib/Makefile
2012-02-13Add behaviour (api) module with callback specsGustav Simonsson
Function parameter and return type specifications for the public key functions
2012-02-13Make dialyzer recognize the process_flag option sensitiveHenrik Nord
add missing specs to documentation
2012-02-13Client now honors the allow_user_interaction optionIngela Anderton Andin
2012-02-13Avoid to crash if the remote side closes the connection prematurelyIngela Anderton Andin
2012-02-13Merge branch 'maint'Ingela Anderton Andin
* maint: Correct access flag handling in sftpd Client fallbacks to ipv4 if connection is refused with ipv6 Cleaned up code so that ssh_file can become a template for a documented ssh_keys behavior Test case maintenance Better handling of IPv6 Ssh daemon handles RSA host keys Removed no longer needed code Use the public_key application for all public key handling
2012-02-13Merge branch 'ia/ssh/public_keys/OTP-9911' into maintIngela Anderton Andin
* ia/ssh/public_keys/OTP-9911: Correct access flag handling in sftpd Client fallbacks to ipv4 if connection is refused with ipv6 Cleaned up code so that ssh_file can become a template for a documented ssh_keys behavior Test case maintenance Better handling of IPv6 Ssh daemon handles RSA host keys Removed no longer needed code Use the public_key application for all public key handling
2012-02-10Correct access flag handling in sftpdIngela Anderton Andin
Also Moved app test to ssh_basic_SUITE There is no reason to have a separate suite for the app test it increases maintenance costs
2012-02-10Client fallbacks to ipv4 if connection is refused with ipv6Ingela Anderton Andin
2012-02-10Cleaned up code so that ssh_file can become a template for a documentedIngela Anderton Andin
ssh_keys behavior
2012-02-10Test case maintenanceIngela Anderton Andin
2012-02-10Better handling of IPv6Ingela Anderton Andin
2012-02-10Ssh daemon handles RSA host keysIngela Anderton Andin
Solves OTP-7677
2012-02-10Removed no longer needed codeIngela Anderton Andin
2012-02-10Use the public_key application for all public key handlingIngela Anderton Andin
Also improved test suites to avoid copying of users keys to test server directories as this is a security liability
2012-02-10Include the xmerl include files in the bootstrapBjörn Gustavsson