otp.git/lib/common_test/src, branch OTP-18.1.4 Mirror of Erlang/OTP repository. Change license text to APLv2 2015-06-18T09:31:02+00:00 Bruce Yinhe bruce@erlang.org 2015-06-18T09:31:02+00:00 738c34d4bb8f1a3811acd00af8c6c12107f8315b 






Remove void() type in documentation
2015-06-16T00:04:13+00:00

Peter Andersson
peppe@erlang.org

2015-06-16T00:04:13+00:00

eb764102275040f1561bc4b0f412e2d2ccff7bec












Merge branch 'peppe/common_test/ct_run_start_and_help'
2015-06-15T23:31:18+00:00

Peter Andersson
peppe@erlang.org

2015-06-15T23:31:18+00:00

c78d31314a77d4c117b127365780c355aed3f271

* peppe/common_test/ct_run_start_and_help:
  Change default start actions and update documentation

OTP-12684





* peppe/common_test/ct_run_start_and_help:
  Change default start actions and update documentation

OTP-12684







Change default start actions and update documentation
2015-06-08T22:51:56+00:00

Peter Andersson
peppe@erlang.org

2015-06-08T22:51:56+00:00

a0a088704e17a9c9f9a0013f07aa90d880a7a50e












Merge branch 'lharc/ct2'
2015-06-08T12:33:05+00:00

Henrik Nord
henrik@erlang.org

2015-06-08T12:32:40+00:00

c825356561bfcb4447cb4298da353244c465d3b3

* lharc/ct2:
  ct_slave: ssh_port, ssh_opts options to start/3
  common_test: start ssh and dependencies

OTP-12809





* lharc/ct2:
  ct_slave: ssh_port, ssh_opts options to start/3
  common_test: start ssh and dependencies

OTP-12809







Update version numbers and app dependencies
2015-05-08T15:50:59+00:00

Peter Andersson
peppe@erlang.org

2015-05-08T15:50:59+00:00

603ffe32e1947e2c9550eabe15c477c343cbaba1












Merge branch 'fishcakez/ct_test_dirs'
2015-05-08T11:39:03+00:00

Zandra Hird
zandra@erlang.org

2015-05-08T11:39:03+00:00

48893d496c6efa9e7bc3340d451d18e8f80393c7

* fishcakez/ct_test_dirs:
  Fix parsing list of one test directory in ct:run_test/1





* fishcakez/ct_test_dirs:
  Fix parsing list of one test directory in ct:run_test/1







Merge branch 'maint'
2015-05-06T11:01:07+00:00

Zandra Hird
zandra@erlang.org

2015-05-06T11:01:07+00:00

0440e0e45835de5adbe790f9437492d734c6c4e1

Conflicts:
	OTP_VERSION
	erts/vsn.mk
	lib/test_server/src/erl2html2.erl





Conflicts:
	OTP_VERSION
	erts/vsn.mk
	lib/test_server/src/erl2html2.erl







Merge branch 'dgud/common_test/netconf-user-caps/OTP-12707' into maint-17
2015-05-06T08:46:18+00:00

Erlang/OTP
otp@erlang.org

2015-05-06T08:46:18+00:00

93655f538f84c156665857bce956526a1181110e

* dgud/common_test/netconf-user-caps/OTP-12707:
  common_test: Add user capability option to hello





* dgud/common_test/netconf-user-caps/OTP-12707:
  common_test: Add user capability option to hello







Merge branch 'peppe/common_test/ct_telnet_wait_for_prompt.maint' into maint-17
2015-05-06T08:46:18+00:00

Erlang/OTP
otp@erlang.org

2015-05-06T08:46:18+00:00

3ed875b9644a44bf04e4244192c302d25ac73ba3

* peppe/common_test/ct_telnet_wait_for_prompt.maint:
  Introduce wait_for_prompt option





* peppe/common_test/ct_telnet_wait_for_prompt.maint:
  Introduce wait_for_prompt option