You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/07/08 15:52:02 UTC
[42/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-1571
Merge branch 'develop' into feature/GEODE-1571
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e4d79df7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e4d79df7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e4d79df7
Branch: refs/heads/develop
Commit: e4d79df78bdb482f66a95ee7c3b02e5ba42c9dcb
Parents: c67f8b7 2ab9d11
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jul 6 15:58:30 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jul 6 15:58:30 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 4 +-
.../cache/tier/sockets/CacheClientProxy.java | 105 +++---
.../tier/sockets/ClientInterestMessageImpl.java | 40 +++
.../internal/offheap/FreeListManager.java | 2 +-
.../CreateAlterDestroyRegionCommands.java | 33 +-
.../GemFireDeadlockDetectorDUnitTest.java | 1 +
.../cache/tier/sockets/CacheServerTestUtil.java | 43 ++-
...eateAlterDestroyRegionCommandsDUnitTest.java | 78 ++--
.../sockets/DurableClientSimpleDUnitTest.java | 357 ++++++-------------
.../tier/sockets/DurableClientTestCase.java | 158 +++-----
...oncurrentParallelGatewaySenderDUnitTest.java | 22 +-
11 files changed, 405 insertions(+), 438 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e4d79df7/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e4d79df7/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --cc geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index dcaca19,b1ad27d..e0de649
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@@ -78,13 -85,7 +83,9 @@@ import com.gemstone.gemfire.management.
import com.gemstone.gemfire.management.internal.configuration.SharedConfigurationWriter;
import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
import com.gemstone.gemfire.management.internal.security.ResourceOperation;
+import com.gemstone.gemfire.security.GeodePermission.Operation;
+import com.gemstone.gemfire.security.GeodePermission.Resource;
- import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
- import org.springframework.shell.core.annotation.CliCommand;
- import org.springframework.shell.core.annotation.CliOption;
-
/**
*
* @since GemFire 7.0