Merge branch 'maint-1.0' into maint-1.1
3afe50866b50
Actions

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

Description

Merge branch 'maint-1.0' into maint-1.1

NOTE Amends recipe during merge to respect changes brought by Invenio v1.1 release series.

Conflicts:
.gitignore
modules/miscutil/lib/inveniocfg.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 18 2015, 15:13

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:3afe50866b50: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 18 2015, 15:13

	Commit			Author	Details	Committed
	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