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

Posted to commits@sling.apache.org by da...@apache.org on 2020/07/15 07:38:51 UTC

[sling-org-apache-sling-feature-extension-apiregions] branch master updated (abfa05f -> facabc9)

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

davidb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-apiregions.git.


    from abfa05f  Merge pull request #8 from bosschaert/SLING-9521
     new 1768397  Test case for SLING-9213
     new 99dc33d  SLING-9213 Region order is not respected when merging
     new facabc9  Merge pull request #9 from bosschaert/SLING-9213-sq

The 77 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:
 .../apiregions/APIRegionMergeHandler.java          |  48 ++++++++--
 .../extension/apiregions/api/ApiRegions.java       |  16 +++-
 .../apiregions/APIRegionMergeHandlerTest.java      | 102 +++++++++++++++++++++
 3 files changed, 158 insertions(+), 8 deletions(-)