You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/12/06 23:13:14 UTC

[19/50] [abbrv] lucene-solr:apiv2: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/346e7665
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/346e7665
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/346e7665

Branch: refs/heads/apiv2
Commit: 346e7665995a8f087a1cac7fee00f0a35abd83b6
Parents: dce5964 eded69b
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 12:25:06 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 12:25:06 2016 +0530

----------------------------------------------------------------------
 .../apache/lucene/index/TestIndexSorting.java   |  5 ++++-
 lucene/ivy-versions.properties                  |  2 +-
 ...jetty-continuation-9.3.14.v20161028.jar.sha1 |  1 +
 .../jetty-continuation-9.3.8.v20160314.jar.sha1 |  1 -
 .../jetty-http-9.3.14.v20161028.jar.sha1        |  1 +
 .../jetty-http-9.3.8.v20160314.jar.sha1         |  1 -
 .../licenses/jetty-io-9.3.14.v20161028.jar.sha1 |  1 +
 .../licenses/jetty-io-9.3.8.v20160314.jar.sha1  |  1 -
 .../jetty-server-9.3.14.v20161028.jar.sha1      |  1 +
 .../jetty-server-9.3.8.v20160314.jar.sha1       |  1 -
 .../jetty-servlet-9.3.14.v20161028.jar.sha1     |  1 +
 .../jetty-servlet-9.3.8.v20160314.jar.sha1      |  1 -
 .../jetty-util-9.3.14.v20161028.jar.sha1        |  1 +
 .../jetty-util-9.3.8.v20160314.jar.sha1         |  1 -
 solr/CHANGES.txt                                |  4 +++-
 .../conf/schema-unifiedhighlight.xml            | 20 +-------------------
 .../handler/admin/CoreAdminHandlerTest.java     |  2 ++
 ...jetty-continuation-9.3.14.v20161028.jar.sha1 |  1 +
 .../jetty-continuation-9.3.8.v20160314.jar.sha1 |  1 -
 .../jetty-deploy-9.3.14.v20161028.jar.sha1      |  1 +
 .../jetty-deploy-9.3.8.v20160314.jar.sha1       |  1 -
 .../jetty-http-9.3.14.v20161028.jar.sha1        |  1 +
 .../jetty-http-9.3.8.v20160314.jar.sha1         |  1 -
 .../licenses/jetty-io-9.3.14.v20161028.jar.sha1 |  1 +
 solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 |  1 -
 .../jetty-jmx-9.3.14.v20161028.jar.sha1         |  1 +
 .../licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 |  1 -
 .../jetty-rewrite-9.3.14.v20161028.jar.sha1     |  1 +
 .../jetty-rewrite-9.3.8.v20160314.jar.sha1      |  1 -
 .../jetty-security-9.3.14.v20161028.jar.sha1    |  1 +
 .../jetty-security-9.3.8.v20160314.jar.sha1     |  1 -
 .../jetty-server-9.3.14.v20161028.jar.sha1      |  1 +
 .../jetty-server-9.3.8.v20160314.jar.sha1       |  1 -
 .../jetty-servlet-9.3.14.v20161028.jar.sha1     |  1 +
 .../jetty-servlet-9.3.8.v20160314.jar.sha1      |  1 -
 .../jetty-servlets-9.3.14.v20161028.jar.sha1    |  1 +
 .../jetty-servlets-9.3.8.v20160314.jar.sha1     |  1 -
 .../jetty-util-9.3.14.v20161028.jar.sha1        |  1 +
 .../jetty-util-9.3.8.v20160314.jar.sha1         |  1 -
 .../jetty-webapp-9.3.14.v20161028.jar.sha1      |  1 +
 .../jetty-webapp-9.3.8.v20160314.jar.sha1       |  1 -
 .../jetty-xml-9.3.14.v20161028.jar.sha1         |  1 +
 .../licenses/jetty-xml-9.3.8.v20160314.jar.sha1 |  1 -
 solr/licenses/start.jar.sha1                    |  2 +-
 44 files changed, 31 insertions(+), 42 deletions(-)
----------------------------------------------------------------------