You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2016/01/06 23:27:04 UTC
ambari git commit: AMBARI-14411. Fix stale cluster entity reference
which results in merge issues. Revert to primitive. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 abdfbadd2 -> 8715004ac
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/8715004a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8715004a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8715004a
Branch: refs/heads/branch-2.2
Commit: 8715004ac1934a3995d6205b0a6d7743e357841b
Parents: abdfbad
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Jan 6 14:26:42 2016 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Jan 6 14:26:42 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/8715004a/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 1b3c872..c2f85e5 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
@@ -189,7 +189,7 @@ public class ClusterImpl implements Cluster {
private final ReentrantReadWriteLock hostTransitionStateLock = new ReentrantReadWriteLock();
private final Lock hostTransitionStateWriteLock = hostTransitionStateLock.writeLock();
- private Long clusterId;
+ private long clusterId;
private String clusterName;