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 2015/03/02 21:26:32 UTC
[1/2] incubator-brooklyn git commit: Changes Entities.descendants to
allow 'Predicat super Entity>' instead of 'Predicate'
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master a6265834f -> d2e1487fb
Changes Entities.descendants to allow 'Predicat<? super Entity>' instead of 'Predicate<Entity>'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0148413a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0148413a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0148413a
Branch: refs/heads/master
Commit: 0148413ac3cb821d35a98f9753a3fd8f7d443956
Parents: a626583
Author: Martin Harris <gi...@nakomis.com>
Authored: Mon Mar 2 17:34:14 2015 +0000
Committer: Martin Harris <gi...@nakomis.com>
Committed: Mon Mar 2 17:34:14 2015 +0000
----------------------------------------------------------------------
core/src/main/java/brooklyn/entity/basic/Entities.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0148413a/core/src/main/java/brooklyn/entity/basic/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java
index f8fff24..5b88087 100644
--- a/core/src/main/java/brooklyn/entity/basic/Entities.java
+++ b/core/src/main/java/brooklyn/entity/basic/Entities.java
@@ -595,7 +595,7 @@ public class Entities {
*
* @see #descendants(Entity, Predicate, boolean)
*/
- public static Iterable<Entity> descendants(Entity root, Predicate<Entity> matching) {
+ public static Iterable<Entity> descendants(Entity root, Predicate<? super Entity> matching) {
return descendants(root, matching, true);
}
[2/2] incubator-brooklyn git commit: This closes #537
Posted by al...@apache.org.
This closes #537
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d2e1487f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d2e1487f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d2e1487f
Branch: refs/heads/master
Commit: d2e1487fbd065ca87e0133ebedd00a41d00cfd11
Parents: a626583 0148413
Author: Aled Sage <al...@gmail.com>
Authored: Mon Mar 2 20:26:13 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Mar 2 20:26:13 2015 +0000
----------------------------------------------------------------------
core/src/main/java/brooklyn/entity/basic/Entities.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------