Merge branch 'maint-1.2' into maint-2.0
e2485a957078
Actions

Authored by kuncar on Mar 23 2015, 23:55.

Description

Merge branch 'maint-1.2' into maint-2.0

maint-1.2: installation: latest h5py version installation: Python path in Apache virtual hosts BibDocFile: safer new bibdocfile model upgrade

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Conflicts:
invenio/legacy/inveniocfg.py
requirements-extras.txt

Committed

kuncar

Mar 23 2015, 23:55

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:e2485a957078: Merge branch 'maint-1.2' into maint-2.0 (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Mar 23 2015, 23:55

Commit	Author	Details	Committed
00eb36813241	Jiri Kuncar	Merge branch 'maint-1.1' into maint-1.2	Mar 23 2015
d9f089c7fa10	Jiri Kuncar	Merge branch 'maint-1.0' into maint-1.1	Mar 23 2015
767e5546961e	Tibor Simko	installation: latest h5py version	Mar 23 2015
880ae3d2b436	Tibor Simko	installation: Python path in Apache virtual hosts	Mar 23 2015
86774125c284	Nikolaos Kasioumis	BibDocFile: safer new bibdocfile model upgrade	Mar 19 2015

				Path
	M			invenio/modules/upgrader/upgrades/invenio_2012_11_15_bibdocfile_model.py