Chris Hostetter 7a5261a222 SOLR-10757: Merge remote-tracking branch 'refs/remotes/origin/master' ... Conflicts: solr/CHANGES.txt		2017-05-31 09:52:25 -07:00
..
src	SOLR-10757: Merge remote-tracking branch 'refs/remotes/origin/master'	2017-05-31 09:52:25 -07:00
build.xml	LUCENE-7292: Use '-release' instead of '-source/-target' during compilation on Java 9+ to ensure real cross-compilation	2016-05-20 22:20:39 +02:00
ivy.xml	SOLR-9966: Convert/migrate tests using EasyMock to Mockito	2017-02-19 07:00:40 +07:00