diff options
| author | Siri Hansen <[email protected]> | 2013-04-30 15:58:21 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-30 15:58:21 +0200 |
| commit | 1158dcc96c3a6a32a042bd6cc361f1c035e9cca1 (patch) | |
| tree | 31c9913293fe3f43a73d91fa67afa13bbe561372 /lib/odbc/subdirs.mk | |
| parent | d93043ca0839e659abada62b0c6cf4d441808acf (diff) | |
| parent | a7c002d0f70526257fcf07d7a4b7320d541da931 (diff) | |
| download | otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.tar.gz otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.tar.bz2 otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[jinterface] Extend timetrap timers in nc_SUITE and jinterface_SUITE
[jinterface] Set max heap size for jvm when running echo_server
[jinterface] Clean up hanging java nodes after each test case
Diffstat (limited to 'lib/odbc/subdirs.mk')
0 files changed, 0 insertions, 0 deletions