From: Dennis Schafroth Date: Thu, 26 Apr 2012 10:43:57 +0000 (+0000) Subject: Merge branch 'master' into protocol-version2 X-Git-Tag: v1.6.13~16^2~2 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=2cd18a993fa7ac2b88ddf780bc3fe1f0507c12cd;p=pazpar2-moved-to-github.git Merge branch 'master' into protocol-version2 --- 2cd18a993fa7ac2b88ddf780bc3fe1f0507c12cd diff --cc test/Makefile.am index aaa63bd,fa77aeb..f00be58 --- a/test/Makefile.am +++ b/test/Makefile.am @@@ -18,14 -16,8 +18,15 @@@ EXTRA_DIST = run_pazpar2.sh marc21_test test_url.cfg test_url.urls \ test_filter.cfg test_filter.urls \ test_termlist_block.cfg test_termlist_block.urls \ + test_facets_settings_1.xml test_facets_settings_2.xml \ + test_url_service.xml test_url_settings_1.xml test_url_settings_2.xml test_url_settings_3.xml test_url_settings_4.xml \ + test_limit_limitmap.cfg test_limit_limitmap.urls \ + test_limit_limitmap_service.xml \ + test_limit_limitmap_setting_1.xml test_limit_limitmap_setting_2.xml \ + test_limit_limitmap_setting_3.xml test_limit_limitmap_setting_4.xml \ + test_limit_limitmap_setting_5.xml \ ztest_localhost_settings.xml test_termlist_block_settings_2.xml \ + test_facets_settings_1.xml test_facets_settings_2.xml \ $(check_SCRIPTS) TESTS = $(check_SCRIPTS)