brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [45/50] brooklyn-server git commit: Fixed issue that was preventing map markers from appearing during tab-to-tab navigation
Date Mon, 01 Feb 2016 17:49:49 GMT
Fixed issue that was preventing map markers from appearing during tab-to-tab navigation


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

Branch: refs/heads/0.6.0
Commit: 9e8df21adc4a7b3a57fd46eb97f87e7bf8b8865a
Parents: b0761ca
Author: Martin Harris <github@nakomis.com>
Authored: Fri Nov 15 11:25:14 2013 +0000
Committer: Martin Harris <github@nakomis.com>
Committed: Fri Nov 15 11:25:14 2013 +0000

----------------------------------------------------------------------
 .../src/main/java/brooklyn/rest/resources/LocationResource.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9e8df21a/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
b/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
index c72057a..ff8fcba 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
@@ -61,6 +61,7 @@ public class LocationResource extends AbstractBrooklynRestResource implements
Lo
       for (Map.Entry<Location,Integer> count: counts.entrySet()) {
           Location l = count.getKey();
           Map<String,Object> m = MutableMap.<String,Object>of(
+                  "id", l.getId(),
                   "name", l.getDisplayName(),
                   "leafEntityCount", count.getValue(),
                   "latitude", l.getConfig(LocationConfigKeys.LATITUDE),


Mime
View raw message