Repository: brooklyn-server Updated Branches: refs/heads/master 69cce32c1 -> 3d8675e24
code mismatch tidy following last PR merge Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3d8675e2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3d8675e2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3d8675e2 Branch: refs/heads/master Commit: 3d8675e248cb229e6492d938655cb26222504fbc Parents: 69cce32 Author: Alex Heneveld <[email protected]> Authored: Fri Jun 30 15:38:29 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Jun 30 15:38:29 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/rest/resources/CatalogResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3d8675e2/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 8208738..ae22c79 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -203,7 +203,7 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat result = ReferenceWithError.newInstanceThrowingError(result.getWithoutError(), new IllegalStateException( "Updating existing catalog entries is forbidden: " + result.getWithoutError().getMetadata().getSymbolicName() + ":" + - result.getWithoutError().getMetadata().getVersion() + + result.getWithoutError().getMetadata().getSuppliedVersionString() + ". Use forceUpdate argument to override.")); }
