brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [42/50] [abbrv] git commit: Merge f93972fbb7a397c275ee0dd73feeecb03bd24cb3 into 1c9ae9245088e6904c4ed66ec1f592e2588e6f8e
Date Fri, 23 May 2014 16:57:27 GMT
Merge f93972fbb7a397c275ee0dd73feeecb03bd24cb3 into 1c9ae9245088e6904c4ed66ec1f592e2588e6f8e


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9f2ef416
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9f2ef416
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9f2ef416

Branch: refs/pull/1405/merge
Commit: 9f2ef416874d9ff4e6db5631fd37799cf7be9a34
Parents: 1c9ae92 f93972f
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri May 23 16:27:03 2014 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri May 23 16:27:03 2014 +0000

----------------------------------------------------------------------
 .../java/brooklyn/entity/basic/Entities.java    | 12 ++++
 .../location/basic/AbstractLocation.java        |  3 +-
 .../location/basic/BasicLocationRegistry.java   | 42 ++++++++----
 .../location/basic/LocationInternal.java        |  7 +-
 .../location/basic/LocationPredicates.java      | 69 +++++++++++++++++++
 .../location/basic/MultiLocationResolver.java   | 71 ++++++++++++++------
 .../location/basic/LocationPredicatesTest.java  | 68 +++++++++++++++++++
 .../basic/MultiLocationResolverTest.java        | 11 +++
 .../entity/proxy/AbstractControllerImpl.java    |  8 ++-
 .../rest/resources/LocationResource.java        | 13 +++-
 10 files changed, 262 insertions(+), 42 deletions(-)
----------------------------------------------------------------------



Mime
View raw message