aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-03-30Merge branch 'maint'Björn-Egil Dahlberg
2012-03-30Update primary bootstrapBjörn-Egil Dahlberg
2012-03-30Merge branch 'maint'Björn-Egil Dahlberg
2012-03-30Update copyright yearsBjörn-Egil Dahlberg
2012-03-30Merge branch 'maint'Gustav Simonsson
2012-03-30Merge branch 'gustav/sasl/release-handler-test-fix-temp' into maintGustav Simonsson
* gustav/sasl/release-handler-test-fix-temp: Moved test case to avoid a conflict between test cases. Temporarily fix for R15B01.
2012-03-30Merge branch 'maint'Siri Hansen
2012-03-30Merge branch 'siri/crashdump_viewer/create_r14b_dump/OTP-10032' into maintSiri Hansen
* siri/crashdump_viewer/create_r14b_dump/OTP-10032: [crashdump_viewer] Add case clause for testing with dump from R14B
2012-03-30[crashdump_viewer] Add case clause for testing with dump from R14BSiri Hansen
2012-03-30Merge branch 'maint'Siri Hansen
2012-03-30Merge branch 'siri/reltool/dialyzer/OTP-10035' into maintSiri Hansen
* siri/reltool/dialyzer/OTP-10035: [reltool] Fix dialyzer warnings for R15B01
2012-03-30Merge branch 'maint'Gustav Simonsson
2012-03-30Merge branch 'ta/docs-maint' into maintGustav Simonsson
* ta/docs-maint: Fix typos in ct getting_started_chapter.xml Fix typos in driver.xml and erl_driver.xml Fix typos in INSTALL-WIN32.md OTP-10037
2012-03-30Merge branch 'maint'Dan Gudmundsson
2012-03-30[eldap] Fix docsDan Gudmundsson
Fix copy paste errors
2012-03-30Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maintDan Gudmundsson
* dgud/wx/misc-improvements/OTP-9947: [wx] Fix list in list in list specs
2012-03-29Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maintKenneth Lundin
* kenneth/asn1/integer_range/OTP-9946: replace 5 sec timeout (too short) with monitor in asn1_db requests Correct handling of INTEGER (1..4 | 8 | 10 | 20)
2012-03-29replace 5 sec timeout (too short) with monitor in asn1_db requestsKenneth Lundin
This bug was introduced as part of the parallelization of test suites and is notpart of any released version
2012-03-29Merge branch 'maint'Dan Gudmundsson
2012-03-29[eldap] Fix docDan Gudmundsson
Functions may not start with space, references do not work.
2012-03-29[reltool] Fix dialyzer warnings for R15B01Siri Hansen
Records #mod{} and #app{} are used in ets:select and must therefore have '$1', '$2' and '_' as possible value of fields.
2012-03-29[wx] Fix list in list in list specsDan Gudmundsson
To many lists
2012-03-29Merge branch 'maint'Lars Thorsen
* maint: Fix descriptions of ssl_client_options and ssl_server_options
2012-03-29Merge branch 'lars/orber/ssl-opts-documentation/OTP-9966' into maintLars Thorsen
* lars/orber/ssl-opts-documentation/OTP-9966: Fix descriptions of ssl_client_options and ssl_server_options
2012-03-29Fix descriptions of ssl_client_options and ssl_server_optionsLars Thorsen
2012-03-29Merge branch 'maint'Dan Gudmundsson
2012-03-29Merge branch 'dgud/eldap' into maintDan Gudmundsson
* dgud/eldap: [eldap] Fix parse_port error handling [eldap] Add rudimentary docs [eldap] Add asn.1 compilation options [eldap] Add dereference options in search [eldap] Remove broken functionality [eldap] Add infrastructure [eldap] Initial copy of Tobbe's eldap client OTP-10034
2012-03-29Merge branch 'maint'Peter Andersson
2012-03-29Merge branch 'peppe/common_test/otp-10029' into maintPeter Andersson
* peppe/common_test/otp-10029: Update documentation OTP-9972
2012-03-29Update documentationPeter Andersson
OTP-9972 OTP-9659 OTP-9855 OTP-9880 OTP-9973 OTP-9986 OTP-9992 OTP-9935
2012-03-28Moved test case to avoid a conflict between test cases.Gustav Simonsson
This is a temporarily fix for R15B01.
2012-03-28Merge branch 'maint'Björn-Egil Dahlberg
2012-03-28Merge branch 'lukas/system/skip_fenris_max_threads' into maintBjörn-Egil Dahlberg
* lukas/system/skip_fenris_max_threads: Skip on buggy solaris
2012-03-28Merge branch 'maint'Björn Gustavsson
* maint: INSTALL.md: Update information about MacOS X
2012-03-28INSTALL.md: Update information about MacOS XBjörn Gustavsson
* Bump version number of Lion. * We no longer run tests on Tiger. * Mark the information about building universal binaries as obsolete.
2012-03-28Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: [xmerl] Fix bug for comments in XSD files [xmerl] Fix error message and documentation bug Corrected dialyzer specs and exported some dialyzer specs
2012-03-28Merge branch 'ia/ssl/dialyzer-specs' into maintIngela Anderton Andin
* ia/ssl/dialyzer-specs: Corrected dialyzer specs and exported some dialyzer specs
2012-03-28Merge branch 'lars/xmerl/xsd-comment-bug/OTP-10023' into maintLars Thorsen
* lars/xmerl/xsd-comment-bug/OTP-10023: [xmerl] Fix bug for comments in XSD files
2012-03-28[xmerl] Fix bug for comments in XSD filesLars Thorsen
2012-03-28Merge branch 'lars/xmerl/sax-fixes/OTP-10026' into maintLars Thorsen
* lars/xmerl/sax-fixes/OTP-10026: [xmerl] Fix error message and documentation bug
2012-03-28[eldap] Fix parse_port error handlingDan Gudmundsson
Dialyzer found that.
2012-03-28[xmerl] Fix error message and documentation bugLars Thorsen
2012-03-27Merge branch 'maint'Peter Andersson
2012-03-27Merge remote branch 'origin/peppe/common_test/otp-10022' into maintPeter Andersson
* origin/peppe/common_test/otp-10022: Fix problem with wrong data_dir sent to hooks if init_per_* is missing
2012-03-27Merge remote branch 'origin/peppe/common_test/otp-10021' into maintPeter Andersson
* origin/peppe/common_test/otp-10021: Increase test margin for user timetraps
2012-03-27Corrected dialyzer specs and exported some dialyzer specsIngela Anderton Andin
2012-03-27[eldap] Add rudimentary docsDan Gudmundsson
2012-03-27Merge branch 'maint'Lukas Larsson
* maint: Rename fin_per_testcase to end_per_testcase
2012-03-27Merge branch 'lukas/system/fix_ct_naming_convention' into maintLukas Larsson
* lukas/system/fix_ct_naming_convention: Rename fin_per_testcase to end_per_testcase
2012-03-27Merge branch 'maint'Gustav Simonsson