ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-14411. Fix stale cluster entity reference which results in merge issues. Revert to primitive. (swagle)
Date Wed, 06 Jan 2016 22:27:46 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 55651a9b9 -> 18dca6011


AMBARI-14411. Fix stale cluster entity reference which results in merge issues. Revert to
primitive. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18dca601
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18dca601
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18dca601

Branch: refs/heads/trunk
Commit: 18dca6011aa153fccd806c292e018f559a98e422
Parents: 55651a9
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Wed Jan 6 14:27:40 2016 -0800
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Wed Jan 6 14:27:40 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/state/cluster/ClusterImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/18dca601/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 6bbd6b7..d752dca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -194,7 +194,7 @@ public class ClusterImpl implements Cluster {
   /**
    * The unique ID of the {@link @ClusterEntity}.
    */
-  private final Long clusterId;
+  private final long clusterId;
 
   private String clusterName;
 


Mime
View raw message