[geode] 02/02: Merge branch 'feature/GEODE_3695' into develop

[bs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit a30de87fbe7c539afeb1be3c0339fa5ca3b1c9dd
Merge: 2502ae0 2c04972
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu Oct 5 13:52:07 2017 -0700

    Merge branch 'feature/GEODE_3695' into develop

 .../cache/tier/sockets/MessageExecutionContext.java      |  1 -
 geode-protobuf/src/main/proto/clientProtocol.proto       | 10 +---------
 geode-protobuf/src/main/proto/region_API.proto           | 16 ----------------
 geode-protobuf/src/main/proto/server_API.proto           | 11 +----------
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --cc geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
index bedb2c7,38f164a..fd1ed4d
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
@@@ -85,7 -85,7 +85,6 @@@ public class MessageExecutionContext 
    /**
     * Returns the statistics for recording operation stats. In a unit test environment this may not
     * be a protocol-specific statistics implementation.
-    *
 -   * 
     */
    public ClientProtocolStatistics getStatistics() {
      return statistics;

-- 
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.