| commit | d2a5c103266ed3499c989d653f2c38c9e72e443a | [log] [tgz] |
|---|---|---|
| author | Mike McCandless <mikemccand@apache.org> | Fri Feb 05 12:38:21 2016 -0500 |
| committer | Mike McCandless <mikemccand@apache.org> | Fri Feb 05 12:38:21 2016 -0500 |
| tree | 8261c502f5b85efc2d1324bbf17fced76b67d3eb | |
| parent | 24f55abfd508d4d36aa697c77fcded534016ca1c [diff] | |
| parent | 4569fd732aa1406763ed94f5df830b324a584a6b [diff] |
Merge branch 'master' into lucene-6835 Conflicts: lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java