You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:47:00 UTC
[47/50] git commit: add @Override as per review comment
add @Override as per review comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/75ca858b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/75ca858b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/75ca858b
Branch: refs/heads/master
Commit: 75ca858b866c77ca49e872c32d2d7229b6c731d3
Parents: 95da84a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 9 12:11:59 2014 -0400
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:47 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/resources/CatalogResource.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/75ca858b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
index b6323a5..91a49fe 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@ -100,6 +100,7 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
}
}
+ @Override
public Response resetXml(String xml) {
((BasicBrooklynCatalog)mgmt().getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "REST reset"));
return Response.ok().build();