Merge branch 'maint-1.1'
eb2646df8cd8
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 18 2015, 17:15.

Description

Merge branch 'maint-1.1'

NOTE During merge, amended Dockerfile instructions to use CentOS-6 with Python-2.6 and MySQL-5.1, fitting our minimal requirements for Invenio-1.2 release series.

NOTE Several tests are known to fail when run via Docker; this will be amended in subsequent commits.

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 18 2015, 23:16

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:eb2646df8cd8: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 18 2015, 23:16

	Commit			Author	Details	Committed
	3afe50866b50			Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Feb 18 2015
	9186606cf59e			Tibor Simko	docker: initial release	Feb 18 2015

				Path
	A			.dockerignore
	M			.gitignore
	A			Dockerfile
	A			docker-compose.yml
	M			modules/miscutil/lib/inveniocfg.py