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 2017/11/21 09:39:12 UTC
[2/3] brooklyn-server git commit: Merge branch 'master' into
misc-cleanups
Merge branch 'master' into misc-cleanups
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9fb62ca3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9fb62ca3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9fb62ca3
Branch: refs/heads/master
Commit: 9fb62ca3031315665adec37a40dcb76b5956caf0
Parents: 733535e bcc4e5c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Nov 17 12:21:44 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Nov 17 12:21:44 2017 +0000
----------------------------------------------------------------------
policy/src/main/resources/catalog.bom | 21 ++++++++++++++++++++
.../coerce/CommonAdaptorTypeCoercions.java | 2 +-
.../util/javalang/coerce/TypeCoercionsTest.java | 9 +++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------