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

Posted to commits@sling.apache.org by pa...@apache.org on 2019/08/15 10:55:16 UTC

[sling-org-apache-sling-feature-modelconverter] 02/03: Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-feature-modelconverter

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git

commit da79899a15a296368f3982ef084e0ebab2fa9d97
Merge: 3f2cece 597cd4d
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Aug 15 12:54:41 2019 +0200

    Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-feature-modelconverter

 .../modelconverter/FeatureToProvisioning.java      | 13 +++++---
 .../modelconverter/ProvisioningToFeature.java      |  2 +-
 src/test/resources/boot.json                       | 36 +++++++++++-----------
 src/test/resources/boot_gav.json                   | 36 +++++++++++-----------
 src/test/resources/launchpad.json                  |  4 +--
 src/test/resources/oak.json                        | 20 ++++++------
 src/test/resources/repoinit.json                   |  6 ++--
 src/test/resources/simple.json                     |  2 +-
 src/test/resources/simple2.json                    |  2 +-
 9 files changed, 62 insertions(+), 59 deletions(-)