summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Add DragonflyBSD support to test_serverTuncer Ayaz2011-05-191-1/+1
* | | | | | | | | | | Merge branch 'dgud/mnesia/prepare-release' into devDan Gudmundsson2011-05-193-33/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prepare mnesia releaseDan Gudmundsson2011-05-172-29/+9
| * | | | | | | | | | | Remove deadcodeDan Gudmundsson2011-05-171-4/+1
* | | | | | | | | | | | Merge branch 'dgud/mnesia/fix_majority_test' into devDan Gudmundsson2011-05-193-112/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Convert majority tests to common test frameworkDan Gudmundsson2011-05-183-112/+14
* | | | | | | | | | | | Merge branch 'rickard/driver_async_cancel/OTP-9302' into devRikard Green2011-05-194-6/+173
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix driver_async_cancel()Rickard Green2011-05-184-6/+173
* | | | | | | | | | | | Merge branch 'hb/erl_eval_docfix/OTP-9322' into devHans Bolinder2011-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a bug in erl_eval(3)Hans Bolinder2011-05-191-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'anders/diameter_import/OTP-9321' into devAnders Svensson2011-05-18153-4/+69987
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Initial commit of the diameter application.Anders Svensson2011-05-18153-4/+69987
* | | | | | | | | | | | Merge branch 'bmk/snmp/snmp420_integration' into devMicael Karlberg2011-05-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed bad links in documentation.Micael Karlberg2011-05-181-1/+2
* | | | | | | | | | | | | Merge branch 'lukas/test_server/timetrap_factor/OTP-9320' into devLukas Larsson2011-05-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update ts to propigate the timetrap factor gotten from test_server:timetrap_s...Lukas Larsson2011-05-161-1/+9
* | | | | | | | | | | | | | Merge branch 'dev' of super:otp into devLukas Larsson2011-05-18508-14496/+30463
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'egil/remove-compile-warnings' into devBjörn-Egil Dahlberg2011-05-183-16/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Remove unused variable warning in inet_resBjörn-Egil Dahlberg2011-05-171-2/+2
| | * | | | | | | | | | | | | | Remove unused variable in epmd_portBjörn-Egil Dahlberg2011-05-171-5/+2
| | * | | | | | | | | | | | | | Remove compiler warnings in inet_drvBjörn-Egil Dahlberg2011-05-171-9/+9
| * | | | | | | | | | | | | | | Merge branch 'pan/escript_in_bootstrap/OTP-9309' into devPatrik Nyblom2011-05-181-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add escript to bootstrap/binPatrik Nyblom2011-05-171-1/+9
| * | | | | | | | | | | | | | | | Merge branch 'pan/win_static_openssl/OTP-9280' into devPatrik Nyblom2011-05-185-21/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Mend --with-ssl= in erts/configurePatrik Nyblom2011-05-131-1/+25
| | * | | | | | | | | | | | | | | Update OpenSSL license text in cryptoPatrik Nyblom2011-05-101-1/+1
| | * | | | | | | | | | | | | | | Link OpenSSL libraries static on WindowsPatrik Nyblom2011-05-104-19/+46
| * | | | | | | | | | | | | | | | Merge branch 'ia/public_key/users-guide/examples' into devIngela Anderton Andin2011-05-184-14/+520
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Corrected documentation error and added examples to Users GuideIngela Anderton Andin2011-05-184-14/+520
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'ia/ssl/do_not_invalidate_session_on_improper_close/OTP-9310' in...Ingela Anderton Andin2011-05-181-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | In TLS 1.1, failure to properly close a connection no longer requiresIngela Anderton Andin2011-05-171-6/+12
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'hb/edoc/bugfixes/OTP-9301' into devHans Bolinder2011-05-183-58/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix bugs concerning the option report_missing_typesHans Bolinder2011-05-173-58/+66
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'ta/re-doc' into devHenrik Nord2011-05-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | re: remove gratuitous "it " in manpageTuncer Ayaz2011-05-161-1/+1
| * | | | | | | | | | | | | | Merge branch 'ta/gitignore-xmerl_test' into devHenrik Nord2011-05-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | git ignore lib/xmerl/test/xmerl_test.erlTuncer Ayaz2011-05-111-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'uw/mnesia-majority' into devHenrik Nord2011-05-1714-28/+546
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | dialyzer warning on mnesia_tmUlf Wiger2011-05-161-3/+1
| | * | | | | | | | | | | | | | Add documentation text about majority checkingUlf Wiger2011-05-162-1/+38
| | * | | | | | | | | | | | | | add mnesia_majority_test suiteUlf Wiger2011-05-163-0/+288
| | * | | | | | | | | | | | | | where_to_wlock optimization + change_table_majority/2Ulf Wiger2011-05-165-29/+96
| | * | | | | | | | | | | | | | bug in mnesia_tm:needs_majority/2Ulf Wiger2011-05-161-1/+1
| | * | | | | | | | | | | | | | optimize sticky_lock maj. checkUlf Wiger2011-05-161-7/+7
| | * | | | | | | | | | | | | | check majority for sticky locksUlf Wiger2011-05-161-0/+18
| | * | | | | | | | | | | | | | Write locks now check majority when needed.Ulf Wiger2011-05-166-12/+52
| | * | | | | | | | | | | | | | Add {majority, boolean()} per-table option.Ulf Wiger2011-05-163-11/+81
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'siri/sasl/test-suites/OTP-5802' into devSiri Hansen2011-05-17131-2/+8181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add SASL test suiteSiri Hansen2011-05-17131-2/+8181
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'siri/reltool/duplicated-module/OTP-9229' into devSiri Hansen2011-05-1711-72/+321
| |\ \ \ \ \ \ \ \ \ \ \ \ \