Diffusion invenio-infoscience 1cecbdf91abc

Merge branch 'maint-1.0' into maint-1.1
1cecbdf91abc
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 11 2015, 17:34.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: global: canonical demo.invenio-software.org URL testutils: no SSL verification for Python-2.7.9

Note: during merge, amended more occurrences of demo site URL.

Conflicts:
modules/bibharvest/web/test_insert_oai_source.html
modules/bibmatch/lib/bibmatch_regression_tests.py
modules/miscutil/lib/testutils.py
modules/websearch/lib/websearch_external_collections_config.py

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

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 11 2015, 17:35

Parents

R3600:83182926ce25: Merge branch 'maint-1.0' into maint-1.1
R3600:05b46bde5b01: global: canonical demo.invenio-software.org URL

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:1cecbdf91abc: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 11 2015, 17:35

Merged Changes

	Commit			Author	Details	Committed
	05b46bde5b01			Tibor Simko	global: canonical demo.invenio-software.org URL	Mar 11 2015
	801f98180171			Tibor Simko	testutils: no SSL verification for Python-2.7.9	Mar 11 2015

Changes (7)

				Path
	M			INSTALL
	M			modules/bibmatch/lib/bibmatch_regression_tests.py
	M			modules/miscutil/lib/__init__.py
	M			modules/miscutil/lib/invenio_connector_regression_tests.py
	M			modules/miscutil/lib/testutils.py
	M			modules/oaiharvest/lib/oai_harvest_web_tests.py
	M			modules/websearch/lib/websearch_external_collections_config.py