Merge r3344 from release 1.3 branch

This commit is contained in:
j2blake 2011-07-20 20:22:47 +00:00
parent d21b9a0fab
commit ec5dd17b86

View file

@ -59,7 +59,9 @@ vitro.local.solr.url = http://localhost:8080/vivosolr
# 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 = 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 VIVO application will store the data that it creates.