You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2018/06/07 15:26:04 UTC
lucene-solr:branch_7_4: SOLR-12018: Remove comments.apache.org
integration for the Ref Guide
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_4 e691bf734 -> 920cefd2f
SOLR-12018: Remove comments.apache.org integration for the Ref Guide
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/920cefd2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/920cefd2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/920cefd2
Branch: refs/heads/branch_7_4
Commit: 920cefd2fa06d7b3449d2d7ebcdf5d9830a0ad05
Parents: e691bf7
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Jun 7 10:17:23 2018 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Jun 7 10:25:56 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 26 ++--
solr/solr-ref-guide/src/_includes/head.html | 1 -
solr/solr-ref-guide/src/_layouts/page.html | 12 --
solr/solr-ref-guide/src/css/comments.css | 160 -----------------------
4 files changed, 14 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/920cefd2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7596601..5de759e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -48,7 +48,7 @@ New Features
----------------------
* SOLR-12396: Upgrade Carrot2 to 3.16.0, HPPC to 0.8.1, morfologik to 2.1.5. (Dawid Weiss)
-* SOLR-11200: A new CMS config option 'ioThrottle' to manually enable/disable
+* SOLR-11200: A new CMS config option 'ioThrottle' to manually enable/disable
ConcurrentMergeSchedule.doAutoIOThrottle. (Amrit Sarkar, Nawab Zada Asad iqbal via Dawid Weiss)
* SOLR-11670: Implement a periodic house-keeping task. This uses a scheduled autoscaling trigger and
@@ -62,7 +62,7 @@ New Features
* SOLR-12139: The "eq" (equals) function query now works with string fields, string literals, and perhaps anything.
(Andrey Kudryavtsev, David Smiley)
-
+
* SOLR-10783: Add support for Hadoop Credential Provider as SSL/TLS store password source.
(Mano Kovacs via Mark Miller)
@@ -171,8 +171,8 @@ Bug Fixes
* SOLR-12172: Fixed race condition that could cause an invalid set of collection properties to be kept in
memory when multiple collection property changes are done in a short period of time. (Tomás Fernández Löbbe)
-
-* SOLR-11929: UpdateLog metrics are not initialized on core reload. (ab, Steve Rowe)
+
+* SOLR-11929: UpdateLog metrics are not initialized on core reload. (ab, Steve Rowe)
* SOLR-11882: SolrMetric registries retained references to SolrCores when closed. A
change of SolrMetricMAnager.registerGauge and SolrMetricProducer.initializeMetrics
@@ -228,8 +228,8 @@ Bug Fixes
* SOLR-12275: wrong caching for {!filters} as well as for `filters` local param in {!parent} and {!child}
(David Smiley, Mikhail Khluldnev)
-
-* SOLR-12284: WordBreakSolrSpellchecker will no longer add parenthesis in collations when breaking words in
+
+* SOLR-12284: WordBreakSolrSpellchecker will no longer add parenthesis in collations when breaking words in
non-boolean queries. (James Dyer)
* SOLR-12290: Do not close any servlet streams and improve our servlet stream closing prevention code for users
@@ -252,9 +252,9 @@ Bug Fixes
about "Invalid Date String". (yonik)
* SOLR-12307: exiting OverseerTriggerThread without endless noise in log when Zookeeper session is expired
- (Mikhail Khludnev)
+ (Mikhail Khludnev)
-* SOLR-12200: abandon OverseerExitThread when ZkController is closed. (Mikhail Khludnev)
+* SOLR-12200: abandon OverseerExitThread when ZkController is closed. (Mikhail Khludnev)
* SOLR-12355: Fixes hash conflict in HashJoinStream and OuterHashJoinStream (Dennis Gove)
@@ -281,7 +281,7 @@ Bug Fixes
* SOLR-12271: Fixed bug in how Analytics component reads negative values from float and double fields. (Houston Putman)
-* SOLR-12433: Recovering flag of a replica is set equals to leader even it failed to receive update
+* SOLR-12433: Recovering flag of a replica is set equals to leader even it failed to receive update
on recovering. (Cao Manh Dat)
* SOLR-12354: Register the /admin/info/key end-point at the startup time to avoid 404 (noble)
@@ -334,6 +334,8 @@ Optimizations
Other Changes
----------------------
+* SOLR-12018: Remove comments.apache.org integration for the Ref Guide; the comments system has been down since December 2017 and there is no concrete plan to bring it back.
+
* SOLR-12076: Remove unnecessary printLayout usage in CDCR tests (Varun Thacker)
* SOLR-12086: Fix format problem in FastLRUCache description string shown on Cache Statistics page.
@@ -415,7 +417,7 @@ Bug Fixes
* SOLR-12256: Fixed some eventual-consistency issues with collection aliases by using ZooKeeper.sync(). (David Smiley)
-* SOLR-12087: Deleting replicas sometimes fails and causes the replicas to exist in the down
+* SOLR-12087: Deleting replicas sometimes fails and causes the replicas to exist in the down
state (Cao Manh Dat)
* SOLR-12146: LIR should skip deleted replicas (Cao Manh Dat)
@@ -431,7 +433,7 @@ Bug Fixes
* SOLR-12202: Fix errors in solr-exporter.cmd. (Minoru Osuka via koji)
* SOLR-12316: Do not allow to use absolute URIs for including other files in solrconfig.xml
- and schema parsing (CVE-2018-8010). (Ananthesh, Ishan Chattopadhyaya, Uwe Schindler)
+ and schema parsing (CVE-2018-8010). (Ananthesh, Ishan Chattopadhyaya, Uwe Schindler)
================== 7.3.0 ==================
@@ -594,7 +596,7 @@ New Features
* SOLR-12077: Add support for autoAddReplicas in the collection creation dialog in Admin UI. (shalin)
-* SOLR-9510: introducing {!filters param=$fq excludeTags=f} query parser.
+* SOLR-9510: introducing {!filters param=$fq excludeTags=f} query parser.
Introducing {!.. filters=$fq excludeTags=t,q} in {!parent} and {!child} (Dr. Oleg Savrasov via Mikhail Khludnev)
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/920cefd2/solr/solr-ref-guide/src/_includes/head.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.html
index ac20a72..60d6e5d 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -12,7 +12,6 @@
<link rel="stylesheet" href="{{ "css/customstyles.css" }}">
<link rel="stylesheet" href="{{ "css/theme-solr.css" }}">
<link rel="stylesheet" href="{{ "css/ref-guide.css" }}">
-<link rel="stylesheet" href="{{ "css/comments.css" }}">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/920cefd2/solr/solr-ref-guide/src/_layouts/page.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.html
index 22f88e6..d9f56c9f 100755
--- a/solr/solr-ref-guide/src/_layouts/page.html
+++ b/solr/solr-ref-guide/src/_layouts/page.html
@@ -68,16 +68,4 @@ layout: default
</div>
-<!-- Adds comments from Apache's Comment system -->
-
-<div id="comments_thread">
-<div style="font-size: 1.6em; color: #d9411e; padding-top: 30px;">Comments on this Page</div>
-<div class="paragraph"><p>We welcome feedback on Solr documentation. However, we cannot provide application support via comments. If you need help, please send a message to the <a href="https://lucene.apache.org/solr/resources.html#community">Solr User mailing list</a>.</p></div>
-</div>
-<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=solr-refguide&style=css/comments.css&page={{ page_id }}" async="true">
-</script>
-<noscript>
-<iframe width="100%" height="500" src="https://comments.apache.org/iframe.lua?site=solr-refguide&style=css/comments.css&page={{ page_id }}"></iframe>
-</noscript>
-
{% include footer.html %}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/920cefd2/solr/solr-ref-guide/src/css/comments.css
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/css/comments.css b/solr/solr-ref-guide/src/css/comments.css
deleted file mode 100644
index f59796a..0000000
--- a/solr/solr-ref-guide/src/css/comments.css
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * comments.css
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#comments_thread a:link {
- color: #5A88B5;
- background-color: inherit;
-}
-
-#comments_thread a:visited {
- color: #5A88B5;
- background-color: inherit;
-}
-
-#comments_thread a:link:hover,
-#comments_thread a:link:active,
-#comments_thread a:visited:hover,
-#comments_thread a:visited:active {
- color: #0073c7;
- background-color: #f0f0f0;
-}
-
-
-/* in general */
-
-#comments_thread h4 {
- font-size: 14px;
-}
-
-.apaste_menu {
- float: right;
- margin-right: 10px;
- width: 80px;
-}
-
-.apaste_comment {
- background: #FEFEFE;
- border: 1px solid #AAA;
- border-radius: 2px;
- display: block;
- white-space: pre-wrap;
- font-weight: normal;
- padding-left: 20px;
- padding-right: 20px;
- padding-bottom: 16px;
- padding-top: 5px;
- margin: 15px;
- font-size: 13px
-}
-.comment_header {
- color: #000000;
- border-radius: 3px;
- border: 1px solid #999;
- min-height: 24px;
- text-indent: 5px;
- font-size: 12pt;
- background: #ffe9a3; /* Old browsers */
- background: -moz-linear-gradient(top, #ffe9a3 0%, #ffd08a 32%, #ff9d57 69%, #ff833d 100%); /* FF3.6-15 */
- background: -webkit-linear-gradient(top, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(to bottom, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-}
-
-.comment_header_verified {
- color: #000000;
- border-radius: 3px;
- border: 1px solid #999;
- min-height: 24px;
- text-indent: 5px;
- font-size: 12pt;
- background: #ffe9a3; /* Old browsers */
- background: -moz-linear-gradient(top, #ffe9a3 0%, #ffd08a 32%, #ff9d57 69%, #ff833d 100%); /* FF3.6-15 */
- background: -webkit-linear-gradient(top, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(to bottom, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-}
-
-.comment_header_sticky {
- color: #000000;
- border-radius: 3px;
- border: 1px solid #999;
- min-height: 24px;
- text-indent: 5px;
- font-size: 12pt;
- background: #ffe9a3; /* Old browsers */
- background: -moz-linear-gradient(top, #ffe9a3 0%, #ffd08a 32%, #ff9d57 69%, #ff833d 100%); /* FF3.6-15 */
- background: -webkit-linear-gradient(top, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(to bottom, #ffe9a3 0%,#ffd08a 32%,#ff9d57 69%,#ff833d 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-}
-
-.comment_header img {
- padding-top: 3px;
- padding-bottom: 2px;
-}
-
-.comment_header_verified img {
- padding-top: 3px;
- padding-bottom: 2px;
-}
-
-.comment_header_sticky img {
- padding-top: 3px;
- padding-bottom: 2px;
-}
-
-.apaste_comment img {
-/* border-radius: 5px;*/
- border: none;
-}
-
-.apaste_comment_selected {background: #F8F4E9;}
-.apaste_comment_notapproved {background: #F8E0E0;}
-.apaste_comment_resolved {background: #FAFCFA;}
-.apaste_comment_sticky {background: #FFFFF6;}
-.apaste_comment_verified {background: #FAFBFA;}
-
-.apaste_comment_invalid {
- color: #999;
- background: #F8F8F8;
-}
-
-
-.apaste_comment textarea {
- width: 480px;
- height: 180px;
-}
-
-#apaste {
- margin: 5px;
- font-weight: normal;
- font-size: 14px;
- color: #024;
-
-}
-#apaste .section {
- padding: 20px;
- padding-left: 80px;
-}
-
-.notapproved {
- background-color: #FEE;
- padding: 5px;
-}
-
-#comments_thread textarea{
- background-color: #ffffff;
- width: auto;
- border: 1px solid #1c1c1c;
- border-radius: 3px;
- box-shadow: 0pt 1px 3px rgba(0, 0, 0, 0.16) inset;
- position: relative;
-}
-
-.apaste_honeypot {
- display: none;
-}
-
-//* Remove external link icons when they appear in comments *//
-a[href^="http://"]:after,
-a[href^="https://"]:after {
- content: none !important;
-}