brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [3/3] incubator-brooklyn git commit: fix minor compile error so we can merge #427
Date Thu, 29 Jan 2015 12:14:07 GMT
fix minor compile error so we can merge #427


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

Branch: refs/heads/master
Commit: beeb4d8baa241049de20669e30c73be73774b0f8
Parents: 932f9ff
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Jan 29 12:13:29 2015 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Jan 29 12:13:29 2015 +0000

----------------------------------------------------------------------
 .../entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/beeb4d8b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java
b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java
index 19cb2ed..164f60a 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java
@@ -94,8 +94,8 @@ public class CouchbaseSyncGatewaySshDriver extends AbstractSoftwareProcessSshDri
                 public boolean apply(@Nullable Entity entity) {
                     // Must either be recognised by a cluster as added, or be the primary
node in a cluster of ONE.
                     return entity instanceof CouchbaseNode
-                      && (Boolean.TRUE.equals(entity.getAttribute(entity.IS_IN_CLUSTER))
-                      || Boolean.TRUE.equals(entity.getAttribute(entity.IS_PRIMARY_NODE)));
+                        && (Boolean.TRUE.equals(entity.getAttribute(CouchbaseNode.IS_IN_CLUSTER))
+                            || Boolean.TRUE.equals(entity.getAttribute(CouchbaseNode.IS_PRIMARY_NODE)));
                 }
             });
             if (cbClusterNode.isPresent()) {
@@ -172,4 +172,5 @@ public class CouchbaseSyncGatewaySshDriver extends AbstractSoftwareProcessSshDri
             return arch + fileExtension;
         }
     }
-}
+
+}
\ No newline at end of file


Mime
View raw message