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 2017/06/30 14:03:09 UTC
[21/27] brooklyn-server git commit: Merge branch
'version-new-rules-prep' into version-new-rules
Merge branch 'version-new-rules-prep' into version-new-rules
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e742da7b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e742da7b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e742da7b
Branch: refs/heads/master
Commit: e742da7bdf22ac41aaa68002f6b05058a65f8442
Parents: 701a1d7 ee853f5
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jun 28 12:26:00 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jun 28 12:26:00 2017 +0100
----------------------------------------------------------------------
.../BrooklynComponentTemplateResolver.java | 2 +-
...lyn.spi.creation.service.ServiceTypeResolver | 19 -------------
.../catalog/internal/BasicBrooklynCatalog.java | 4 +--
.../core/typereg/RegisteredTypeNaming.java | 3 +-
.../util/text/BrooklynVersionSyntax.java | 29 ++++++++++----------
.../util/text/NaturalOrderComparator.java | 2 ++
.../brooklyn/util/text/VersionComparator.java | 13 ++++-----
7 files changed, 28 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e742da7b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e742da7b/utils/common/src/main/java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java
----------------------------------------------------------------------