Merge r8765 from release 1.3 branch

This commit is contained in:
j2blake 2011-07-20 20:30:11 +00:00
parent 30fa390d07
commit 0d1e79148e

View file

@ -49,7 +49,10 @@ vitro.local.solr.url = http://localhost:8080/vitrosolr
# vitro.local.solr.ipaddress.mask = 127\.0\.0\.1 # vitro.local.solr.ipaddress.mask = 127\.0\.0\.1
# vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1 # vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1
# vitro.local.solr.ipaddress.mask = 169.254.* # vitro.local.solr.ipaddress.mask = 169.254.*
vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1 # If this expression doesn't match the IP address, you will see SolrExceptions
# in the log.
vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,[0:]+:1[^:]*,
# #
# The location where the Vitro application will store the data that it creates. # The location where the Vitro application will store the data that it creates.