Diffusion invenio-infoscience 316f0f7213fb

Merge branch 'maint-1.1' into maint-1.2
316f0f7213fb
Actions

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

Description

Merge branch 'maint-1.1' into maint-1.2

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

Conflicts:
modules/bibmatch/lib/bibmatch_regression_tests.py
modules/miscutil/lib/invenio_connector_regression_tests.py
modules/miscutil/lib/testutils.py
modules/oaiharvest/lib/oai_harvest_web_tests.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:56

Parents

R3600:1cecbdf91abc: Merge branch 'maint-1.0' into maint-1.1
R3600:1f44bd56885d: Invenio v1.2.0

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:316f0f7213fb: Merge branch 'maint-1.1' into maint-1.2 (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 11 2015, 17:56

Merged Changes

Commit	Author	Details	Committed
1cecbdf91abc	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Mar 11 2015
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