svn commit: r979982 - in /websites/staging/lucene/trunk/content: ./ solr/news.html

[bu...@apache.org]

Author: buildbot
Date: Tue Feb  9 23:10:05 2016
New Revision: 979982

Log:
Staging update by buildbot for lucene

Modified:
    websites/staging/lucene/trunk/content/   (props changed)
    websites/staging/lucene/trunk/content/solr/news.html

Propchange: websites/staging/lucene/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb  9 23:10:05 2016
@@ -1 +1 @@
-1729447
+1729496

Modified: websites/staging/lucene/trunk/content/solr/news.html
==============================================================================
--- websites/staging/lucene/trunk/content/solr/news.html (original)
+++ websites/staging/lucene/trunk/content/solr/news.html Tue Feb  9 23:10:05 2016
@@ -199,14 +199,15 @@ For information on working with git, ple
 <a href="http://lucene.apache.org/solr/resources.html#solr-version-control">the Solr web site</a>
 and the <a href="https://wiki.apache.org/solr/Git%20commit%20process">wiki</a>.</p>
 <p>The <a href="https://github.com/apache/lucene-solr/">GitHub mirror</a> remains at 
-the same location as before, but since it now mirrors git.apache.org, the contents
-have changed. Therefore, if you had a personal fork, you will find
-that it has changed its "origin remote", and you will have to re-add the
-Apache repo as your origin, and then rebase your changes. Instructions
-<a href="https://wiki.apache.org/solr/Git%20commit%20process">here</a>.</p>
-<p>If you had active Pull Requests against our GitHub mirror, these are unfortunately
-gone, but not lost. Please create a new PR against the new mirror or send an email 
-to the <a href="mailto:dev@lucene.apache.org">dev-list</a> to ask for details of your old one.</p>
+the same location as before, but the contents have changed. We now have
+one unified repo preserving the full history of both Lucene and Solr.
+If you had a GitHub fork, you will find
+that it has changed its "forked from" location, and any Pull Request will go to
+that other fork instead of to the Lucene developers. The only known solution is to
+delete your existing fork and re-fork from <a href="https://github.com/apache/lucene-solr/">GitHub</a>.</p>
+<p>If you had active code changes and Pull Requests against our old GitHub mirror,
+please see <a href="https://wiki.apache.org/solr/HowToContribute#Working_with_GitHub">the wiki</a>
+for some suggestions on how to proceed.</p>
 <p>The PMC is happy to answer any question you may have regarding this change.</p>
 <h2 id="23-january-2016-apache-solr-532-available">23 January 2016 - Apache Solr 5.3.2 Available<a class="headerlink" href="#23-january-2016-apache-solr-532-available" title="Permanent link">&para;</a></h2>
 <p>The Lucene PMC is pleased to announce the release of Apache Solr 5.3.2</p>