Oleg Pudeyev 01607be42a Merge PR #1201 branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.

Conflicts:
	.travis.yml

2013-01-24 01:16:56 -05:00

..

install-php-extensions.sh

[ticket/11338] Travis CI: Install PHP extension for redis key-value store.

2013-01-23 01:39:39 +01:00

phpunit-mysql-travis.xml

Merge PR #1201 branch 'develop-olympus' into develop

2013-01-24 01:16:56 -05:00

phpunit-postgres-travis.xml

Merge PR #1201 branch 'develop-olympus' into develop

2013-01-24 01:16:56 -05:00

setup-webserver.sh

[ticket/11337] Abort setup-webserver.sh script when an error occurs.

2013-01-23 15:48:44 +01:00