Merge branch 'maint-1.2' into legacy
3e246af0e22e
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 6 2016, 11:24.

Description

Merge branch 'maint-1.2' into legacy

maint-1.2: installation: support for Ubuntu 14.04 LTS installation: use of /usr/sbin/service installation: Apache and Redis start-up WebSearch: fix for da today 3650 test case BibCatalog: no email tests when no SMTP server installation: web node h5py provisioning WebSession: silencing MySQL UTF-8 warnings

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 6 2016, 14:09

Parents

Branches

Unknown

Tags

Unknown

References

origin/legacy, legacy

Tibor Simko <tibor.simko@cern.ch> committed R3600:3e246af0e22e: Merge branch 'maint-1.2' into legacy (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 6 2016, 14:09

Commit	Author	Details	Committed
48c62330bceb	Tibor Simko	Merge branch 'maint-1.1' into maint-1.2	Jun 5 2016
89b4eee2ab5f	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jun 5 2016
75373d2c28c6	Tibor Simko	installation: support for Ubuntu 14.04 LTS	Jun 3 2016
cc5779c16db4	Tibor Simko	installation: use of `/usr/sbin/service`	Jun 3 2016
5a7481ac7f3a	Tibor Simko	installation: Apache and Redis start-up	Jun 3 2016
6a9cf772f3fb	Tibor Simko	WebSearch: fix for da today 3650 test case	Jun 3 2016
1c2818e9632d	Tibor Simko	BibCatalog: no email tests when no SMTP server	Jun 2 2016
23c9c67dc504	Tibor Simko	installation: web node h5py provisioning	Jun 2 2016
4585ef5940ab	Tibor Simko	WebSession: silencing MySQL UTF-8 warnings	Jun 1 2016

				Path
	M			INSTALL
	M			Vagrantfile
	M			modules/bibcatalog/lib/bibcatalog_system_email_unit_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websession/lib/websession_regression_tests.py
	M			scripts/create-instance.sh
	M			scripts/drop-instance.sh
	M			scripts/populate-instance.sh
	M			scripts/provision-mysql.sh
	M			scripts/provision-web.sh