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 2018/09/06 09:18:45 UTC

[sling-org-apache-sling-feature-io] 01/01: Merge pull request #2 from apache/variables

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-io.git

commit cbd250f22fb77afd6c85c4193898123a0fa34026
Merge: 252c549 3ac2898
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Sep 6 11:18:42 2018 +0200

    Merge pull request #2 from apache/variables
    
    Change variable handling to not allow variables to be defined twice

 .../feature/io/json/ConfigurationJSONReader.java   |   5 -
 .../sling/feature/io/json/FeatureJSONReader.java   |  19 ++--
 .../sling/feature/io/json/JSONReaderBase.java      |  12 +--
 .../feature/io/json/FeatureJSONReaderTest.java     |  49 ---------
 src/test/resources/features/test2.json             | 107 -------------------
 src/test/resources/features/test3.json             | 116 ---------------------
 6 files changed, 9 insertions(+), 299 deletions(-)