[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-447-g692120d

[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  692120de6b6fc2a6970cda14424188487c405cb9 (commit)
       via  45c1f70e6cfac37e5517418c0714e5b5718f6e60 (commit)
      from  cfae69933d110209c140c35157f4ddef12921b88 (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=692120de6b6fc2a6970cda14424188487c405cb9
commit 692120de6b6fc2a6970cda14424188487c405cb9
Merge: cfae699 45c1f70
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 12:12:49 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 8 12:12:49 2014 -0500

    Merge topic 'update-curl' into next
    
    45c1f70e Tests: Update expected CTestTestFailedSubmit output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45c1f70e6cfac37e5517418c0714e5b5718f6e60
commit 45c1f70e6cfac37e5517418c0714e5b5718f6e60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 12:09:39 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 8 12:12:18 2014 -0500

    Tests: Update expected CTestTestFailedSubmit output
    
    Add another error message that curl now produces.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 586f983..40fef07 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2675,6 +2675,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   set(regex "${regex}([Cc]ould *n.t resolve host")
   set(regex "${regex}|[Cc]ould *n.t connect to host")
   set(regex "${regex}|Failed *t*o* connect to")
+  set(regex "${regex}|Connection timed out after [0-9]+ milliseconds")
   set(regex "${regex}|Empty reply from server")
   set(regex "${regex}|The requested URL returned error")
   set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")

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

Summary of changes:
 Tests/CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake