svn propchange: r1802505 - svn:log

2017-07-20 Thread justin
Author: justin Revision: 1802505 Modified property: svn:log Modified: svn:log at Thu Jul 20 15:19:32 2017 -- --- svn:log (original) +++ svn:log Thu Jul 20 15:19:32 2017 @@ -1 +1 @@ -Merge branch 'SLING-7015' +SLING-7015 -

svn commit: r1802505 - in /sling/trunk/bundles/extensions/models: api/src/main/java/org/apache/sling/models/factory/ impl/ impl/src/main/java/org/apache/sling/models/impl/ impl/src/test/java/org/apach

2017-07-20 Thread justin
Author: justin Date: Thu Jul 20 15:14:15 2017 New Revision: 1802505 URL: http://svn.apache.org/viewvc?rev=1802505=rev Log: Merge branch 'SLING-7015' Added: sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java

svn commit: r1015729 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/resource-merger.html

2017-07-20 Thread buildbot
Author: buildbot Date: Thu Jul 20 13:06:04 2017 New Revision: 1015729 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html Propchange:

svn commit: r1015730 - /websites/production/sling/content/

2017-07-20 Thread sseifert
Author: sseifert Date: Thu Jul 20 13:06:11 2017 New Revision: 1015730 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1015729, websites/staging/sling/trunk/content/

svn commit: r1802481 - /sling/site/trunk/content/documentation/bundles/resource-merger.mdtext

2017-07-20 Thread sseifert
Author: sseifert Date: Thu Jul 20 13:05:33 2017 New Revision: 1802481 URL: http://svn.apache.org/viewvc?rev=1802481=rev Log: fix typo Modified: sling/site/trunk/content/documentation/bundles/resource-merger.mdtext Modified:

sling-site git commit: Point to JBake flexmark-java pull request

2017-07-20 Thread bdelacretaz
Repository: sling-site Updated Branches: refs/heads/master d3599c6f5 -> 8cdb06203 Point to JBake flexmark-java pull request Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/8cdb0620 Tree: