Merge with master

diff --git a/test/Makefile.am b/test/Makefile.am
index eeffaf9..3029310 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
        test_post.cfg test_post.urls \
        test_settings.cfg test_settings.urls \
        test_solr.cfg test_solr.urls \
-       test_solr_settings_1.xml  test_solr_settings_2.xml  test_solr_settings_3.xml  test_solr_settings_4.xml test_solr_settings_5.xml \
+       test_solr_settings_1.xml test_solr_settings_2.xml  test_solr_settings_3.xml \
+       test_solr_settings_4.xml test_solr_settings_5.xml  test_solr_settings_6.xml \
        test_sort.cfg test_sort.urls \
        test_sort_settings.xml  \
        test_turbomarcxml.cfg test_turbomarcxml.urls \

diff --git a/test/test_solr.urls b/test/test_solr.urls
index f251ec8..93d143a 100644 (file)
--- a/test/test_solr.urls
+++ b/test/test_solr.urls
@@ -36,4 +36,3 @@ http://localhost:9763/search.pz2?session=1&command=search&query=au%3D%3F&sort=au
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=author:1
 http://localhost:9763/search.pz2?session=1&command=search&query=au%3D%3F&sort=author:0
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=author:0
-