github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-3.0.1' into develop

pull/62/merge
Pepijn Over 2014-04-12 14:07:38 +02:00
parent 7e16103603 e55d6acf04
commit 37ad5ed411
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,3 +1,2 @@
.gitignore export-ignore .gitignore export-ignore
.gitattributes export-ignore .gitattributes export-ignore
./Makefile export-ignore

2
CHANGELOG.rst
View File

@ -1,7 +1,7 @@
Changelog Changelog
========= =========
not yet released v3.0.1 (released April 12, 2014)
---------------- ----------------
* #56: Minimum PHP version is PHP 5.3.7 (not PHP 5.3.0). * #56: Minimum PHP version is PHP 5.3.7 (not PHP 5.3.0).

1
Makefile
View File

@ -15,6 +15,7 @@ export:
@echo 'Building HTML documentation' @echo 'Building HTML documentation'
cd ./build/phpservermon/docs; make BUILDDIR=. html; cd ../../../; cd ./build/phpservermon/docs; make BUILDDIR=. html; cd ../../../;
@echo 'Cleaning up docs dir' @echo 'Cleaning up docs dir'
rm -f ./build/phpservermon/Makefile
rm -f ./build/phpservermon/docs/Makefile rm -f ./build/phpservermon/docs/Makefile
rm -f ./build/phpservermon/docs/make.bat rm -f ./build/phpservermon/docs/make.bat
rm -f ./build/phpservermon/docs/conf.py rm -f ./build/phpservermon/docs/conf.py

2
README.rst
View File

@ -1,7 +1,7 @@
PHP Server Monitor PHP Server Monitor
================== ==================
Version 3.1.0-dev Version 3.0.1
PHP Server Monitor is a script that checks whether your websites and servers are up and running. PHP Server Monitor is a script that checks whether your websites and servers are up and running.
It comes with a web based user interface where you can manage your services and websites, It comes with a web based user interface where you can manage your services and websites,

2
docs/conf.py
View File

@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '3.1.0-dev' version = '3.0.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version

2
src/includes/psmconfig.inc.php
View File

@ -29,7 +29,7 @@
/** /**
* Current PSM version * Current PSM version
*/ */
define('PSM_VERSION', '3.1.0-dev'); define('PSM_VERSION', '3.0.1');
/** /**
* URL to check for updates. Will not be checked if turned off on config page. * URL to check for updates. Will not be checked if turned off on config page.