You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by da...@apache.org on 2018/10/08 22:18:06 UTC

[isis] 02/03: Merge branch 'ISIS-2003'

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c770024dc6b32234c1742aa9c663f754701ffda5
Merge: 1b92c24 e0b92af
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 8 23:00:51 2018 +0100

    Merge branch 'ISIS-2003'

 .../services/metamodel/MetaModelService6.java      |    65 +-
 ...est.java => MetaModelService6_Config_Test.java} |    12 +-
 .../metamodel/facetapi/FacetWithAttributes.java    |     2 +-
 .../services/metamodel/MetaModelExporter.java      |   186 +-
 .../metamodel/MetaModelServiceDefault.java         |     4 +-
 .../apache/isis/schema/metamodel/metamodel-1.0.xsd |    19 +-
 ...MetaModelService_IntegTest.exports.approved.xml | 44873 +------------------
 .../tests/mml/MetaModelService_IntegTest.java      |    11 +-
 8 files changed, 466 insertions(+), 44706 deletions(-)