Merge branch 'maint-1.0' into maint-1.1
389de2132d4d
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 25 2016, 15:40.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: installation: initial release of kickstart scripts WebAccess: FireRole documentation fix

Note: Amended scripts/create-instance.sh during merge with new installation targets (mediaelement).

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

Committed

Tibor Simko <tibor.simko@cern.ch>

May 25 2016, 16:25

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:389de2132d4d: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).May 25 2016, 16:25

	Commit			Author	Details	Committed
	d6264b9abef5			Tibor Simko	installation: initial release of kickstart scripts	May 25 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		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
A	(dir)	scripts/
P		scripts/Makefile.am Copied from modules/bibauthorid/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