[sling-org-apache-sling-api] branch master updated (ddeb4ec -> aaf0a43)

[kw...@apache.org]

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

kwin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git.


    from ddeb4ec  trivial: added license header to *.md files
     add 543606c  SLING-8084 clarify javadoc for ResourceResolver.map
     new aaf0a43  Merge pull request #7 from apache/SLING-8084-clarify-javadoc-for-RR-map

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:
 .../apache/sling/api/resource/ResourceResolver.java   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

[sling-org-apache-sling-api] 01/01: Merge pull request #7 from apache/SLING-8084-clarify-javadoc-for-RR-map

[kw...@apache.org]

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

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

commit aaf0a43dd7fe8d80861579b2744b045cbd6cd2e2
Merge: ddeb4ec 543606c
Author: Konrad Windszus <ko...@gmx.de>
AuthorDate: Fri Nov 9 07:26:05 2018 +0100

    Merge pull request #7 from apache/SLING-8084-clarify-javadoc-for-RR-map
    
    SLING-8084 clarify javadoc for ResourceResolver.map

 .../apache/sling/api/resource/ResourceResolver.java   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)