Merge remote-tracking branch 'aledsage/LotsOfGroovyToJava'
Conflicts:
core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.groovy -
summing enricher generics, looks more correct in branch
core/src/main/java/brooklyn/entity/basic/BasicEntity.java - alternate
impls, doesn't seem significant
core/src/main/java/brooklyn/entity/group/DynamicFabric.groovy - Fabric
interface was added in HEAD but groovy deleted in branch; manually applied to
this merge
core/src/main/java/brooklyn/entity/trait/Startable.groovy - generics
removed in one, changed in other; taking the changed one, it looks correct
core/src/main/java/brooklyn/util/GroovyJavaMethods.groovy - two
different impls for methods; preferred the more explicit ones, with comment
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/807f3758
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/807f3758
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/807f3758
Branch: refs/heads/0.4.0
Commit: 807f37581af5125bb36e83caca2813588ce0437f
Parents: e30d9d9 d23bc5b
Author: Alex Heneveld <[email protected]>
Authored: Tue Jun 5 12:30:09 2012 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Tue Jun 5 12:30:09 2012 +0100
----------------------------------------------------------------------
.../utils/brooklyn/web/console/TestWebApplication.groovy | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
