summaryrefslogtreecommitdiff
path: root/test/stdout/2014
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-11-25 11:23:26 +0100
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-11-25 11:25:08 +0100
commit4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch)
tree3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stdout/2014
parent7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff)
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stdout/2014')
-rw-r--r--test/stdout/20141
1 files changed, 1 insertions, 0 deletions
diff --git a/test/stdout/2014 b/test/stdout/2014
index 56c959f20..c7aab62f1 100644
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -18,6 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
+A TLS fatal alert has been received.
Failed to start TLS
End of script
Connecting to 127.0.0.1 port 1225 ... connected