summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-17.5.4Erlang/OTP2015-05-182-1/+2
* Update release notesErlang/OTP2015-05-182-1/+35
* Merge branch 'hans/ssh/ssh_msg_debug_fun/OTP-12738' into maint-17Erlang/OTP2015-05-185-9/+119
|\
| * ssh: option for handling the SSH_MSG_DEBUG message's printoutsHans Nilsson2015-05-135-9/+119
* | Merge branch 'hans/inets/bad_content_length/OTP-12739' into maint-17Erlang/OTP2015-05-182-3/+7
|\ \ | |/ |/|
| * inets: reject negative content-lengthHans Nilsson2015-05-122-3/+7
|/
* Updated OTP versionOTP-17.5.3Erlang/OTP2015-05-062-1/+2
* Prepare releaseErlang/OTP2015-05-066-2/+174
* Merge branch 'anders/diameter/17.5.3/OTP-12702' into maint-17Erlang/OTP2015-05-063-69/+62
|\
| * Fix broken pre-17.4 appupAnders Svensson2015-05-032-66/+45
| * Update appup for 17.5.3Anders Svensson2015-05-031-2/+16
| * vsn -> 1.9.1Anders Svensson2015-05-031-1/+1
* | Merge branch 'anders/diameter/counters/OTP-12701' into maint-17Erlang/OTP2015-05-063-13/+208
|\ \
| * | Add counters testcase to 3xxx suiteAnders Svensson2015-05-031-1/+199
| * | Fix counting error with unknown application idAnders Svensson2015-05-031-11/+7
| * | Add missing doc wordingAnders Svensson2015-05-031-1/+2
| |/
* | Merge branch 'anders/diameter/result_codes/OTP-12654' into maint-17Erlang/OTP2015-05-062-98/+173
|\ \
| * | Fix broken traffic testcaseAnders Svensson2015-05-051-3/+2
| * | Match harder in traffic suiteAnders Svensson2015-05-051-25/+25
| * | Don't confuse Result-Code and Experimental-ResultAnders Svensson2015-05-052-71/+147
| |/
* | Merge branch 'anders/diameter/extra_avp_bit/OTP-12642' into maint-17Erlang/OTP2015-05-062-4/+8
|\ \
| * | Remove extra avp bit from diameter_avp decodeAnders Svensson2015-04-032-4/+8
| |/
* | Merge branch 'dgud/common_test/netconf-user-caps/OTP-12707' into maint-17Erlang/OTP2015-05-062-11/+28
|\ \
| * | common_test: Add user capability option to helloDan Gudmundsson2015-05-052-11/+28
* | | Merge branch 'peppe/common_test/ct_telnet_wait_for_prompt.maint' into maint-17Erlang/OTP2015-05-063-18/+99
|\ \ \
| * | | Introduce wait_for_prompt optionPeter Andersson2015-05-043-18/+99
| |/ /
* | | Merge branch 'peppe/common_test/timetrap_line.maint' into maint-17Erlang/OTP2015-05-063-48/+110
|\ \ \
| * | | Fix problem with line number not always showing in logPeter Andersson2015-05-043-48/+110
| |/ /
* | | Merge branch 'peppe/common_test/modify_vts.maint' into maint-17Erlang/OTP2015-05-066-38/+1328
|\ \ \
| * | | Get the VTS mode working with private CT version of webtoolPeter Andersson2015-05-045-34/+109
| * | | Change order of ct_run help sectionsPeter Andersson2015-05-041-16/+23
| * | | Prepare for webtool integration with CTPeter Andersson2015-05-043-5/+1213
| |/ /
* | | Merge branch 'peppe/common_test/longname_problem.maint' into maint-17Erlang/OTP2015-05-061-7/+8
|\ \ \
| * | | Fix error in ct_logs, not handling long names correctlyPeter Andersson2015-05-041-7/+8
| |/ /
* | | Merge branch 'peppe/test_tools_vsn.maint' into maint-17Erlang/OTP2015-05-062-2/+2
|\ \ \
| * | | Bump version numbersPeter Andersson2015-05-042-2/+2
| |/ /
* | | Merge branch 'dgud/common_test/netconf/OTP-12698' into maint-17Erlang/OTP2015-05-062-80/+57
|\ \ \
| * | | common_test: Recurse when there is more data in netconfDan Gudmundsson2015-05-042-80/+57
| |/ /
* | | Merge branch 'raimo/snmp/net_if-port-0-with-fd-option/OTP-12669' into maint-17Erlang/OTP2015-05-065-11/+15
|\ \ \ | |/ / |/| |
| * | Improve agent fix as in managerRaimo Niskanen2015-04-301-35/+34
| * | Use port 0 with {fd,Fd}, use snmpm_fd in managerRaimo Niskanen2015-04-235-41/+46
| |/
* | Updated OTP versionOTP-17.5.2Erlang/OTP2015-04-222-1/+2
* | Update release notesErlang/OTP2015-04-222-1/+43
* | Merge branch 'hans/ssh/banner_grabbing/OTP-12659' into maint-17Erlang/OTP2015-04-225-7/+161
|\ \
| * | ssh: added id_string option for server and clientHans Nilsson2015-04-215-7/+161
* | | Merge branch 'hans/inets/banner_grabbing/OTP-12661' into maint-17Erlang/OTP2015-04-224-7/+13
|\ \ \ | |/ / |/| |
| * | inets: Add value 'none' in server_tokens configHans Nilsson2015-04-214-7/+13
|/ /
* | Updated OTP versionOTP-17.5.1Erlang/OTP2015-04-102-1/+2
* | Update release notesErlang/OTP2015-04-101-0/+22
* | Merge branch 'ia/ssh/packet_size0/OTP-12645' into maint-17Erlang/OTP2015-04-109-220/+287
|\ \ | |/ |/|