[Cmake-commits] CMake branch, next, updated. v3.1.2-1179-g17fef0d

[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  17fef0dae571e0f745c3dd14facd90e68cf8c9db (commit)
       via  56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (commit)
      from  a0272926fcd2ff20b26092c789dd6ae9538fc5e5 (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=17fef0dae571e0f745c3dd14facd90e68cf8c9db
commit 17fef0dae571e0f745c3dd14facd90e68cf8c9db
Merge: a027292 56cb4a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 12:59:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 12:59:00 2015 -0500

    Merge topic 'fix_timeout_docs' into next
    
    56cb4a6c Help: Fix variable reference in TIMEOUT test property docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee
commit 56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:07:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 12:58:01 2015 -0500

    Help: Fix variable reference in TIMEOUT test property docs
    
    Link to 'CTEST_TEST_TIMEOUT', not 'CTEST_TESTING_TIMEOUT'.

diff --git a/Help/prop_test/TIMEOUT.rst b/Help/prop_test/TIMEOUT.rst
index 0b247b8..d1cb90d 100644
--- a/Help/prop_test/TIMEOUT.rst
+++ b/Help/prop_test/TIMEOUT.rst
@@ -6,4 +6,4 @@ How many seconds to allow for this test.
 This property if set will limit a test to not take more than the
 specified number of seconds to run.  If it exceeds that the test
 process will be killed and ctest will move to the next test.  This
-setting takes precedence over CTEST_TESTING_TIMEOUT.
+setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`.

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

Summary of changes:


hooks/post-receive
-- 
CMake