You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/02/24 07:12:56 UTC

[49/53] [abbrv] lucene-solr git commit: 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/a33236aa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a33236aa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a33236aa

Branch: refs/heads/apiv2
Commit: a33236aa02b3cc71d45974f2f0fefafbe1cf7a6b
Parents: 4d9d0c0 a77d67a
Author: Noble Paul <no...@apache.org>
Authored: Tue Feb 23 16:15:28 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Feb 23 16:15:28 2016 +0530

----------------------------------------------------------------------
 lucene/ivy-versions.properties                  |   4 +-
 solr/contrib/clustering/ivy.xml                 |   3 -
 solr/licenses/attributes-binder-1.2.3.jar.sha1  |   1 -
 solr/licenses/attributes-binder-1.3.1.jar.sha1  |   1 +
 solr/licenses/mahout-collections-1.0.jar.sha1   |   1 -
 .../licenses/mahout-collections-LICENSE-ASL.txt | 202 -------------------
 solr/licenses/mahout-collections-NOTICE.txt     |  56 -----
 solr/licenses/mahout-math-0.6.jar.sha1          |   1 -
 solr/licenses/mahout-math-LICENSE-ASL.txt       | 202 -------------------
 solr/licenses/mahout-math-NOTICE.txt            |  56 -----
 10 files changed, 2 insertions(+), 525 deletions(-)
----------------------------------------------------------------------