geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [16/18] incubator-geode git commit: Merge branch 'feature/GEODE-1162' into feature/GEODE-17-2
Date Tue, 12 Apr 2016 21:16:41 GMT
Merge branch 'feature/GEODE-1162' into feature/GEODE-17-2

# Conflicts:
#	geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3d45e754
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3d45e754
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3d45e754

Branch: refs/heads/feature/GEODE-17-2
Commit: 3d45e7543557bb072da35d1bb789a7fcfff5115f
Parents: 78b7d62
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Tue Apr 12 09:08:22 2016 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Tue Apr 12 09:08:22 2016 -0700

----------------------------------------------------------------------
 .../management/internal/cli/commands/CliCommandTestBase.java        | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d45e754/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 66a9995..bda8e23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.json.JSONException;
 
 import java.io.IOException;
 import java.io.PrintStream;


Mime
View raw message