You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/11/17 21:54:30 UTC
[20/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Merge remote-tracking branch 'origin/develop' into feature/GEODE-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/afa0a6e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/afa0a6e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/afa0a6e9
Branch: refs/heads/feature/GEODE-77
Commit: afa0a6e9c1d45ea0d5c19b01b3ab3380706fdd5b
Parents: f189ff5 cfbeaf2
Author: Ashvin Agrawal <as...@apache.org>
Authored: Sun Nov 8 20:17:30 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Sun Nov 8 20:17:30 2015 -0800
----------------------------------------------------------------------
.../management/MemoryThresholdsDUnitTest.java | 34 +++++++++++++++++++-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../GemFireDeadlockDetectorDUnitTest.java | 2 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 2 +-
.../control/TestMemoryThresholdListener.java | 13 ++++++++
.../internal/i18n/BasicI18nJUnitTest.java | 12 -------
.../src/main/java/org/json/JSONObject.java | 2 ++
7 files changed, 52 insertions(+), 16 deletions(-)
----------------------------------------------------------------------