Merge branch 'maint-1.1'
45de93b95a14
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 24 2013, 20:09.

Description

Merge branch 'maint-1.1'

maint-1.1: WebSubmit: optional pdftk regression tests WebSearch: field-filtered MARCXML API output WebSearch: more complete API regression test suite

NOTE: the merge commit amends API regression tests as per new demo records added in the master branch.

Conflicts:
modules/websearch/lib/websearch_regression_tests.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 24 2013, 20:55

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:45de93b95a14: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 24 2013, 20:55

Commit	Author	Details	Committed
e5e88fab9b48	Samuele Kaplun/Tibor Simko	WebSubmit: optional pdftk regression tests	Sep 24 2013
71df9665bf5f	Tibor Simko	WebSearch: field-filtered MARCXML API output	Sep 24 2013
9ccaba1cdbc9	Tibor Simko	WebSearch: more complete API regression test suite	Sep 22 2013

				Path
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websubmit/lib/websubmit_regression_tests.py