geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [01/10] incubator-geode git commit: GEODE-907: Fixing rebase merge conflicts
Date Tue, 23 Feb 2016 22:06:06 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 6e1b05c50 -> c2363f7fc


GEODE-907: Fixing rebase merge conflicts


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

Branch: refs/heads/develop
Commit: e623d8e12e33b2850d3cb0b0cdb92782d28fc515
Parents: b4d4ceb
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Thu Feb 18 19:49:36 2016 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Tue Feb 23 14:04:50 2016 -0800

----------------------------------------------------------------------
 .../gemfire/tools/pulse/internal/data/Cluster.java    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e623d8e1/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
index 471cc01..60b353e 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
@@ -19,10 +19,9 @@
 
 package com.vmware.gemfire.tools.pulse.internal.data;
 
-
-import com.vmware.gemfire.tools.pulse.internal.json.JSONArray;
-import com.vmware.gemfire.tools.pulse.internal.json.JSONException;
-import com.vmware.gemfire.tools.pulse.internal.json.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.vmware.gemfire.tools.pulse.internal.log.PulseLogWriter;
 import com.vmware.gemfire.tools.pulse.internal.util.StringUtils;
 import org.apache.commons.collections.buffer.CircularFifoBuffer;
@@ -54,13 +53,6 @@ import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.collections.buffer.CircularFifoBuffer;
-
-import com.vmware.gemfire.tools.pulse.internal.log.PulseLogWriter;
-
 /**
  * Class Cluster This class is the Data Model for the data used for the Pulse
  * Web UI.


Mime
View raw message