Align with master
authorDennis Schafroth <dennis@schafroth.com>
Fri, 29 Nov 2013 15:02:57 +0000 (16:02 +0100)
committerDennis Schafroth <dennis@schafroth.com>
Fri, 29 Nov 2013 15:02:57 +0000 (16:02 +0100)
commit1cd46fc8da47d9bd3d33fd5d2182c4aefcfb388b
tree13f5331c16bb4a79a2a168d68f02fbac7c06bea9
parentcd5e7796bfdc2b5acb3fee1c1bb541b38dc2927a
Align with master
zookeeper/solr/collection1/conf/solrconfig.xml