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

Posted to commits@sling.apache.org by je...@apache.org on 2019/03/29 14:26:44 UTC

[sling-org-apache-sling-jcr-contentloader] branch SLING-8243 updated (2f844ab -> 462ce17)

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

jeb pushed a change to branch SLING-8243
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git.


    from 2f844ab  re-enabled access control implementations
     new 56f8d4e  SLING-7245 - Validate pull requests using Jenkins
     new 396a2da  Updating badges for org-apache-sling-jcr-contentloader
     new 4092432  clean up
     new 98bb74a  Added propertyMerge option
     new 3668145  setting working version
     new ac981e4  refactoring
     new 3cad2a5  null pointer fix
     new a8756d0  handle null in json
     new 46d1a2a  Merge branch 'master' into SLING-8243
     new 462ce17  fixed issue with child node being removed

The 275 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../sling/jcr/contentloader/ImportOptions.java     |  8 +++--
 .../internal/DefaultContentCreator.java            | 35 ++++++++++++++++------
 .../internal/DefaultContentImporter.java           |  5 ++--
 .../contentloader/internal/readers/JsonReader.java |  9 ++++--
 .../it/SLING7268InitialContentIT.java              |  2 +-
 5 files changed, 42 insertions(+), 17 deletions(-)