lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [2/3] lucenenet git commit: merge with upstream/head, fix conflicts
Date Sun, 25 Jan 2015 14:06:31 GMT
merge with upstream/head, fix conflicts


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9776c706
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9776c706
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9776c706

Branch: refs/heads/master
Commit: 9776c7060c33b65c35b8b55af1d9b9177432cca4
Parents: 4edb41b 1b806eb
Author: Laimonas Simutis <laimis@gmail.com>
Authored: Sun Jan 25 07:43:40 2015 -0500
Committer: Laimonas Simutis <laimis@gmail.com>
Committed: Sun Jan 25 07:43:40 2015 -0500

----------------------------------------------------------------------
 .../Codecs/Lucene3x/Lucene3xNormsProducer.cs    |  6 +--
 .../Document/BinaryDocValuesField.cs            |  7 ++-
 src/Lucene.Net.Core/Document/Field.cs           | 46 ++++++++++----------
 .../Document/NumericDocValuesField.cs           |  2 +-
 .../Document/SortedDocValuesField.cs            |  4 +-
 src/Lucene.Net.Core/Index/SegmentCoreReaders.cs |  3 +-
 .../Codecs/lucene3x/PreFlexRWNormsConsumer.cs   |  6 +--
 .../Index/BaseIndexFileFormatTestCase.cs        | 31 +++++++------
 .../Index/BaseTermVectorsFormatTestCase.cs      | 12 ++---
 .../Index/RandomIndexWriter.cs                  |  2 +-
 10 files changed, 61 insertions(+), 58 deletions(-)
----------------------------------------------------------------------



Mime
View raw message