You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/01/12 13:02:28 UTC
[sling-org-apache-sling-resourcemerger] branch master updated
(070a6e3 -> 3962295)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git.
from 070a6e3 [maven-release-plugin] prepare for next development iteration
add 7c5c0dc SLING-7375 Moving order using overlapping children causing IndexOutOfBoundException
new 3962295 Merge pull request #2 from rishi05091989/master
The 1 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:
.../impl/MergingResourceProvider.java | 6 +++++-
.../impl/CommonMergedResourceProviderTest.java | 22 +++++++++++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-resourcemerger] 01/01: Merge pull request
#2 from rishi05091989/master
Posted by cz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 39622956692d465574403530bcd1514c2e0ba88b
Merge: 070a6e3 7c5c0dc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jan 12 14:02:26 2018 +0100
Merge pull request #2 from rishi05091989/master
SLING-7375 Moving order using overlapping children causing IndexOutOf…
.../impl/MergingResourceProvider.java | 6 +++++-
.../impl/CommonMergedResourceProviderTest.java | 22 +++++++++++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.