Merge branch 'master' into next
7719f16c33cc
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Oct 3 2013, 11:45.

Description

Merge branch 'master' into next

master: kwalitee: list comprehensions instead of lambdas kwalitee: compatibility with pylint 1.0.0 WebSubmit: optional pdftk regression tests WebSearch: field-filtered MARCXML API output WebSearch: more complete API regression test suite

Conflicts:
modules/websearch/lib/websearch_regression_tests.py
modules/websubmit/lib/websubmit_regression_tests.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 3 2013, 11:45

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:7719f16c33cc: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Oct 3 2013, 11:45

Commit	Author	Details	Committed
f6f54d5ab09a	Tibor Simko	Merge branch 'maint-1.1'	Oct 3 2013
7933882599e7	Tibor Simko	kwalitee: list comprehensions instead of lambdas	Oct 3 2013
5c060260a269	Tibor Simko	kwalitee: compatibility with pylint 1.0.0	Oct 3 2013
45de93b95a14	Tibor Simko	Merge branch 'maint-1.1'	Sep 24 2013
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/miscutil/lib/kwalitee.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websubmit/lib/websubmit_regression_tests.py