Merge with master
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:39:33 +0000 (09:39 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:39:33 +0000 (09:39 +0200)
commit0f1fa7a2780b5d03377a4b4e57cba09c83f7b987
tree25b6d280127419e1edd27d44342e7b9ce31cce22
parent5f9bcb0650ab5b1661bf75f320dfbb204c6b6d6b
Merge with master
67 files changed:
IDMETA
NEWS
TODO [deleted file]
configure.ac
debian/changelog [deleted file]
doc/Makefile.am
doc/pazpar2_protocol.xml
etc/default.xml
etc/mkc.xml
etc/pazpar2.cfg.dist
etc/perf_server.cfg
etc/pz2.xsd
src/eventl.c
src/eventl.h
src/session.c
src/settings.c
test/Makefile.am
test/run_pazpar2.sh
test/test_cluster.urls
test/test_dads.urls
test/test_facets.urls
test/test_filter.urls
test/test_gbv_de.urls
test/test_http.urls
test/test_http_45.res
test/test_http_49.res
test/test_http_50.res
test/test_http_60.res
test/test_http_63.res
test/test_http_65.res
test/test_http_66.res
test/test_http_71.res
test/test_http_72.res
test/test_http_74.res
test/test_http_76.res
test/test_http_79.res
test/test_http_81.res
test/test_http_82.res
test/test_http_84.res
test/test_http_88.res
test/test_http_89.res
test/test_http_90.res
test/test_icu.urls
test/test_limit_limitmap.urls
test/test_perf.cfg [new file with mode: 0644]
test/test_perf.sh [new file with mode: 0755]
test/test_perf.urls [new file with mode: 0644]
test/test_perf_1.res [new file with mode: 0644]
test/test_perf_2.res [new file with mode: 0644]
test/test_perf_3.res [new file with mode: 0644]
test/test_perf_4.res [new file with mode: 0644]
test/test_perf_5.res [new file with mode: 0644]
test/test_post.urls
test/test_preferred.urls
test/test_rank.urls
test/test_settings.urls
test/test_solr.urls
test/test_solr_spell.urls
test/test_sort.urls
test/test_sort_6.res
test/test_sort_settings.xml
test/test_sru-proxy.urls
test/test_sru.urls
test/test_termlist_block.urls
test/test_turbomarcxml.urls
test/test_url.urls
win/makefile