Noble Paul 501d73b4b8 Merge remote-tracking branch 'origin/branch_6x' into branch_6x ... Conflicts: solr/CHANGES.txt		2016-07-25 21:14:17 +05:30
..
src	Merge remote-tracking branch 'origin/branch_6x' into branch_6x	2016-07-25 21:14:17 +05:30
build.xml	LUCENE-6420: Use forbidden-apis annotation @SuppressForbidden; cleanup maven build	2015-04-20 15:22:06 +00:00
ivy.xml	SOLR-8180: jcl-over-slf4j is officially a solrj/solr dependency now; not marked optional in a POM.	2015-12-01 18:12:00 +00:00