Merge branch 'maint-1.1' into maint-1.2
1374e6096ba5
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 30 2016, 16:32.

Description

Merge branch 'maint-1.1' into maint-1.2

maint-1.1: installation: initial release of kickstart scripts OAIRepository: CFG_OAI_METADATA_FORMATS fix WebAccess: FireRole documentation fix

Merge note: adds necessary changes to maint-1.1 installation kickstart scripts. Notably, locks mathplotlib version and adds Redis provisioning (for the time being into the web server).

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

Committed

Tibor Simko <tibor.simko@cern.ch>

May 31 2016, 11:47

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:1374e6096ba5: Merge branch 'maint-1.1' into maint-1.2 (authored by Tibor Simko <tibor.simko@cern.ch>).May 31 2016, 11:47

Commit	Author	Details	Committed
389de2132d4d	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	May 25 2016
d6264b9abef5	Tibor Simko	installation: initial release of kickstart scripts	May 25 2016
196e2207effa	Samuele Kaplun	OAIRepository: CFG_OAI_METADATA_FORMATS fix	Mar 30 2016
e7ba096e0ffa	Samuele Kaplun/Tibor Simko	WebAccess: FireRole documentation fix	Mar 24 2016

		Path
M		.gitignore
A		.inveniorc
M		.travis.yml
M		INSTALL
M		Makefile.am
A		Vagrantfile
M		config/invenio.conf
M		configure.ac
M		modules/miscutil/lib/inveniocfg.py
M		modules/webaccess/doc/admin/webaccess-admin-guide.webdoc
M		modules/websession/lib/websession_regression_tests.py
M		modules/websession/lib/webuser_regression_tests.py
M		modules/websubmit/lib/websubmit_regression_tests.py
D		requirements-extras.txt
M		requirements.txt
A	(dir)	scripts/
P		scripts/Makefile.am Copied from modules/bibauthorid/doc/admin/Makefile.am
A		scripts/create-instance.sh
A		scripts/drop-instance.sh
A		scripts/make-install.sh
A		scripts/populate-instance.sh
A		scripts/provision-mysql.sh
A		scripts/provision-web.sh