[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-791-gd79b8e8

[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  d79b8e85700981667f30e1b35ee9ba1b3c323ce5 (commit)
       via  3837a64f0f4956aefb08c4ce4cd838607492503b (commit)
      from  3accc2823c60bc93c779d5911bfd7d9c3fc9d091 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d79b8e85700981667f30e1b35ee9ba1b3c323ce5
commit d79b8e85700981667f30e1b35ee9ba1b3c323ce5
Merge: 3accc28 3837a64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 28 08:23:01 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 28 08:23:01 2016 -0400

    Merge topic 'cmake-server-handshake-improvements' into next
    
    3837a64f Revise topic 'cmake-server-handshake-improvements'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3837a64f0f4956aefb08c4ce4cd838607492503b
commit 3837a64f0f4956aefb08c4ce4cd838607492503b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 28 08:22:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 28 08:22:35 2016 -0400

    Revise topic 'cmake-server-handshake-improvements'
    
    Fix typo.

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 47093c3..09b08fe 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -259,7 +259,7 @@ static bool testValue(cmState* state, const std::string& key,
   if (!cachedValue.empty() && !value.empty() && cachedValue != value) {
     setErrorMessage(errorMessage, std::string("\"") + key +
                       "\" is set but incompatible with configured " +
-                      keyDescription + "value.");
+                      keyDescription + " value.");
     return false;
   }
   if (value.empty()) {

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

Summary of changes:
 Source/cmServerProtocol.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake