Return-Path: X-Original-To: apmail-lucenenet-commits-archive@www.apache.org Delivered-To: apmail-lucenenet-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3EE7BC7A5 for ; Sun, 11 Jan 2015 00:33:13 +0000 (UTC) Received: (qmail 61704 invoked by uid 500); 11 Jan 2015 00:33:14 -0000 Delivered-To: apmail-lucenenet-commits-archive@lucenenet.apache.org Received: (qmail 61679 invoked by uid 500); 11 Jan 2015 00:33:14 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 61650 invoked by uid 99); 11 Jan 2015 00:33:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Jan 2015 00:33:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 326829A88EC; Sun, 11 Jan 2015 00:33:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: synhershko@apache.org To: commits@lucenenet.apache.org Date: Sun, 11 Jan 2015 00:33:19 -0000 Message-Id: In-Reply-To: <6129635c654d41829de570baad4ccef0@git.apache.org> References: <6129635c654d41829de570baad4ccef0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] lucenenet git commit: Merge remote-tracking branch 'laimis/FieldCacheSanitychecker_CompositeReaderContext_fixes' Merge remote-tracking branch 'laimis/FieldCacheSanitychecker_CompositeReaderContext_fixes' Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6c653073 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6c653073 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6c653073 Branch: refs/heads/master Commit: 6c653073c91d7979c68a73e1ed6f6f0429297080 Parents: b46c67c 6aef0b0 Author: Itamar Syn-Hershko Authored: Sun Jan 11 02:32:49 2015 +0200 Committer: Itamar Syn-Hershko Committed: Sun Jan 11 02:32:49 2015 +0200 ---------------------------------------------------------------------- src/Lucene.Net.Core/Index/CompositeReaderContext.cs | 10 +++++----- src/Lucene.Net.Core/Util/FieldCacheSanityChecker.cs | 2 +- .../core/Util/TestFieldCacheSanityChecker.cs | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) ----------------------------------------------------------------------