You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/01 00:24:41 UTC
[3/5] git commit: Merge remote-tracking branch
'andreaturli/more-entitlements' into more-entitlements
Merge remote-tracking branch 'andreaturli/more-entitlements' into more-entitlements
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f150725e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f150725e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f150725e
Branch: refs/heads/master
Commit: f150725ea9c214ad65319d73c83a9df5a77ceac8
Parents: 79c8c40 82136c7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Jun 30 21:01:14 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Jun 30 21:01:14 2014 +0100
----------------------------------------------------------------------
.../entitlement/EntitlementManager.java | 8 ++-
.../entitlement/EntitlementManagerAdapter.java | 51 ++++++++++++++++++++
.../management/entitlement/Entitlements.java | 44 ++++++++++++++---
.../rest/resources/ApplicationResource.java | 26 ++++++----
.../main/java/brooklyn/util/guava/Maybe.java | 2 +-
.../main/java/brooklyn/util/time/Duration.java | 6 +++
6 files changed, 120 insertions(+), 17 deletions(-)
----------------------------------------------------------------------