You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/10/20 12:34:40 UTC
[1/4] brooklyn-library git commit: Update pom SCM & Jenkins URLs
Repository: brooklyn-library
Updated Branches:
refs/heads/master a9e9c253a -> 96a0445a7
Update pom SCM & Jenkins URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/cc1ee20c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/cc1ee20c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/cc1ee20c
Branch: refs/heads/master
Commit: cc1ee20c8438d540189b6803616640e1fb86e460
Parents: 621bf5f
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 13 17:44:58 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 13 17:44:58 2016 +0300
----------------------------------------------------------------------
pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/cc1ee20c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 473feaa..7363022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
</parent>
<artifactId>brooklyn-library</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Library Root</name>
@@ -45,9 +44,9 @@
</developers>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-library.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-library.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=brooklyn-library.git</url>
<tag>HEAD</tag>
</scm>
@@ -57,7 +56,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/incubator-brooklyn-master-build/</url>
+ <url>https://builds.apache.org/view/Brooklyn/job/brooklyn-library-master/</url>
</ciManagement>
<mailingLists>
<mailingList>
[4/4] brooklyn-library git commit: This closes #63
Posted by sj...@apache.org.
This closes #63
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/96a0445a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/96a0445a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/96a0445a
Branch: refs/heads/master
Commit: 96a0445a782d5fd4e1b88dba094d7e36504f399c
Parents: eed3e67 cc1ee20
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Oct 20 13:32:12 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Oct 20 13:32:12 2016 +0100
----------------------------------------------------------------------
pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/4] brooklyn-library git commit: Set proper datastore.url in
ElasticSearch
Posted by sj...@apache.org.
Set proper datastore.url in ElasticSearch
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8b58040c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8b58040c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8b58040c
Branch: refs/heads/master
Commit: 8b58040cfa070232222a75255928e842d0342501
Parents: a9e9c25
Author: Valentin Aitken <bo...@gmail.com>
Authored: Wed Oct 19 18:36:20 2016 +0100
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Wed Oct 19 18:36:47 2016 +0100
----------------------------------------------------------------------
.../entity/nosql/elasticsearch/ElasticSearchNodeImpl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b58040c/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
index ccb09e8..6bc89df 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
@@ -72,9 +72,7 @@ public class ElasticSearchNodeImpl extends SoftwareProcessImpl implements Elasti
Integer rawPort = getAttribute(HTTP_PORT);
String hostname = getAttribute(HOSTNAME);
checkNotNull(rawPort, "HTTP_PORT sensors not set for %s; is an acceptable port available?", this);
-
- sensors().set(DATASTORE_URL, String.format("http://%s:%s", hostname, rawPort));
-
+
HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, rawPort);
Function<Maybe<JsonElement>, String> getNodeId = new Function<Maybe<JsonElement>, String>() {
@Override public String apply(Maybe<JsonElement> input) {
@@ -85,6 +83,7 @@ public class ElasticSearchNodeImpl extends SoftwareProcessImpl implements Elasti
}
};
+ sensors().set(DATASTORE_URL, String.format("http://%s", hp));
if (isHttpMonitoringEnabled()) {
boolean retrieveUsageMetrics = getConfig(RETRIEVE_USAGE_METRICS);
[3/4] brooklyn-library git commit: This closes #67
Posted by sj...@apache.org.
This closes #67
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/eed3e678
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/eed3e678
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/eed3e678
Branch: refs/heads/master
Commit: eed3e678ed3bc1393ba8c65c49f4c027b4ca8d4c
Parents: a9e9c25 8b58040
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Oct 20 13:31:52 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Oct 20 13:31:52 2016 +0100
----------------------------------------------------------------------
.../entity/nosql/elasticsearch/ElasticSearchNodeImpl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------