From e55d6acf04f56e45a10ba2dafdbd71308327b247 Mon Sep 17 00:00:00 2001 From: Pepijn Over Date: Sat, 12 Apr 2014 13:38:26 +0200 Subject: [PATCH] changing release version to 3.0.1; removng makefile from export --- .gitattributes | 1 - CHANGELOG.rst | 2 +- Makefile | 1 + README.rst | 2 +- docs/conf.py | 2 +- src/includes/psmconfig.inc.php | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 792d22cf..575a4e5f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ .gitignore export-ignore .gitattributes export-ignore -./Makefile export-ignore diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 641cf956..1b035fce 100755 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ 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). diff --git a/Makefile b/Makefile index 814d893f..e54754a6 100755 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ export: @echo 'Building HTML documentation' cd ./build/phpservermon/docs; make BUILDDIR=. html; cd ../../../; @echo 'Cleaning up docs dir' + rm -f ./build/phpservermon/Makefile rm -f ./build/phpservermon/docs/Makefile rm -f ./build/phpservermon/docs/make.bat rm -f ./build/phpservermon/docs/conf.py diff --git a/README.rst b/README.rst index 58d058c6..4dce7196 100755 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ 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. It comes with a web based user interface where you can manage your services and websites, diff --git a/docs/conf.py b/docs/conf.py index 12f0b996..b8104397 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over' # built documents. # # The short X.Y version. -version = '3.1.0-dev' +version = '3.0.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php index d5062f78..58ab54ce 100644 --- a/src/includes/psmconfig.inc.php +++ b/src/includes/psmconfig.inc.php @@ -29,7 +29,7 @@ /** * 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.