[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-596-gc2459bf

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c2459bf1167b9e019292b7dfe1b7cb2bf9657a36 (commit)
       via  6f36887fea0c630d40b2238f2e4679e24ca4408b (commit)
      from  7697f2d205067cf5eb7b0b387314a621b8d896f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2459bf1167b9e019292b7dfe1b7cb2bf9657a36
commit c2459bf1167b9e019292b7dfe1b7cb2bf9657a36
Merge: 7697f2d 6f36887
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:01:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:01:34 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    6f36887f fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f36887fea0c630d40b2238f2e4679e24ca4408b
commit 6f36887fea0c630d40b2238f2e4679e24ca4408b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:01:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:10 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index c75b209..4345918 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake