[1/2] sling-site git commit: another TODO

Repository: sling-site Updated Branches: refs/heads/master 6931ba4fe -> 79bfc6ee5 another TODO Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/1424e2c0 Tree:

[2/2] sling-site git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/sling-site

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/sling-site Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/79bfc6ee Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/79bfc6ee Diff:

svn commit: r1799588 - in /sling/trunk/tooling/ide/eclipse-ui: icons/obj16/internal_browser.png plugin.xml

Author: rombert Date: Thu Jun 22 14:43:57 2017 New Revision: 1799588 URL: http://svn.apache.org/viewvc?rev=1799588=rev Log: SLING-6980 - Missing internal_browser.gif icon on Eclipse Oxygen Added icon to plug-in instead of relying on an external one. Added:

svn commit: r1799574 - in /sling/trunk/contrib/extensions/resourcemerger/src: main/java/org/apache/sling/resourcemerger/impl/picker/ test/java/org/apache/sling/resourcemerger/impl/

Author: kwin Date: Thu Jun 22 12:34:00 2017 New Revision: 1799574 URL: http://svn.apache.org/viewvc?rev=1799574=rev Log: clarify naming of overlay vs. override pickers Added:

svn commit: r1799573 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java

Author: kwin Date: Thu Jun 22 12:25:29 2017 New Revision: 1799573 URL: http://svn.apache.org/viewvc?rev=1799573=rev Log: clarify relatedResource in Javadoc Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java

sling-site git commit: SLING-6955 - Convert Sling website to JBake and gitpubsub

Repository: sling-site Updated Branches: refs/heads/master 9ea2122d3 -> 6931ba4fe SLING-6955 - Convert Sling website to JBake and gitpubsub Fix CSS declaration for pre tag Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit:

Jenkins build is back to normal : sling-ide #106

See

Build failed in Jenkins: sling-ide #105

See Changes: [rombert] SLING-6970 - Use versions of the tooling support bundles indepenendent of commons.json -- [...truncated 354.23 KB...] [INFO] Downloading:

svn commit: r1799547 - in /sling/trunk/tooling/ide/artifacts: pom.xml src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java

Author: rombert Date: Thu Jun 22 08:13:43 2017 New Revision: 1799547 URL: http://svn.apache.org/viewvc?rev=1799547=rev Log: SLING-6970 - Use versions of the tooling support bundles indepenendent of commons.json Modified: sling/trunk/tooling/ide/artifacts/pom.xml