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 2016/09/23 13:20:19 UTC
[1/2] brooklyn-server git commit: Fix LocalUsageManagerTest
Repository: brooklyn-server
Updated Branches:
refs/heads/master 25120edc6 -> 9b602930b
Fix LocalUsageManagerTest
shouldSkipOnBoxBaseDirResolution return type was changed from boolean to
Boolean in super-class.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2e36aab6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2e36aab6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2e36aab6
Branch: refs/heads/master
Commit: 2e36aab62b46250f28df2af81b146ae19eb7baef
Parents: cb92126
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 23 14:18:17 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Sep 23 14:18:17 2016 +0100
----------------------------------------------------------------------
.../apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2e36aab6/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java
index 362c390..e00788c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManagerTest.java
@@ -45,7 +45,7 @@ public class LocalUsageManagerTest extends BrooklynAppUnitTestSupport {
// Also see {Application|Location}UsageTrackingTest for listener functionality
@Override
- protected boolean shouldSkipOnBoxBaseDirResolution() {
+ protected Boolean shouldSkipOnBoxBaseDirResolution() {
return true;
}
[2/2] brooklyn-server git commit: This closes #346
Posted by al...@apache.org.
This closes #346
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9b602930
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9b602930
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9b602930
Branch: refs/heads/master
Commit: 9b602930b92847d6ecd38c6d2ad30932462771dd
Parents: 25120ed 2e36aab
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 23 14:19:56 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Sep 23 14:19:56 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------