Merge branch 'master' into next
2af64930a238
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 9 2013, 10:22.

Description

Merge branch 'master' into next

master: importutils: fix None values error installation: support for Apache-2.4 WebSearch: CERN-specific hack update

Merge note: discarding Apache-2.4 related changes done by second master's commit above while waiting for a patch coming from ticket:1522.

Conflicts:
modules/miscutil/lib/inveniocfg.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 9 2013, 10:22

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:2af64930a238: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 9 2013, 10:22

Commit	Author	Details	Committed
b7272e2cacd2	Esteban J. G. Gabancho/Tibor Simko	importutils: fix None values error	Aug 9 2013
117a9d6f5d4e	Samuele Kaplun/Tibor Simko	installation: support for Apache-2.4	Aug 8 2013
9a763ba72afc	Jerome Caffaro/Tibor Simko	WebSearch: CERN-specific hack update	Jul 18 2013

				Path
	M			modules/miscutil/lib/importutils.py
	M			modules/miscutil/lib/importutils_unit_tests.py
	M			modules/websearch/lib/search_engine.py