diff --git a/Doxyfile b/Doxyfile index 70ecc2bd76..93d7ad8af7 100644 --- a/Doxyfile +++ b/Doxyfile @@ -39,7 +39,7 @@ PROJECT_NAME = "Pulse" # control system is used. -PROJECT_NUMBER = "4.6.6" +PROJECT_NUMBER = "4.6.7" # Using the PROJECT_BRIEF tag one can provide an optional one line description diff --git a/agent/mmc/agent.py b/agent/mmc/agent.py index cd1dffde9d..11df937a71 100644 --- a/agent/mmc/agent.py +++ b/agent/mmc/agent.py @@ -120,7 +120,7 @@ def doRollover(self): Fault = xmlrpclib.Fault ctx = None -VERSION = "4.6.6" +VERSION = "4.6.7" class IncludeStartsWithFilter(logging.Filter): diff --git a/agent/mmc/plugins/admin/__init__.py b/agent/mmc/plugins/admin/__init__.py index 39c0c79f1b..8e7e9ffd83 100644 --- a/agent/mmc/plugins/admin/__init__.py +++ b/agent/mmc/plugins/admin/__init__.py @@ -1,4 +1,4 @@ -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "0:0:0" REVISION = "" diff --git a/agent/mmc/plugins/base/__init__.py b/agent/mmc/plugins/base/__init__.py index 69ee1beaeb..3a551fe374 100644 --- a/agent/mmc/plugins/base/__init__.py +++ b/agent/mmc/plugins/base/__init__.py @@ -90,7 +90,7 @@ modList= None -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "9:0:5" REVISION = scmRevision("$Rev$") diff --git a/agent/mmc/plugins/dashboard/__init__.py b/agent/mmc/plugins/dashboard/__init__.py index 51791ded5b..1a9d4c1e99 100644 --- a/agent/mmc/plugins/dashboard/__init__.py +++ b/agent/mmc/plugins/dashboard/__init__.py @@ -30,7 +30,7 @@ ComputersOnlinePanel, UpdatePanel, BackupPanel, SuccessRatePanel, \ DeploymentsLaunchedPanel, AgentsPanel -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "0:1:0" REVISION = "" diff --git a/agent/mmc/plugins/ppolicy/__init__.py b/agent/mmc/plugins/ppolicy/__init__.py index d91d27e58f..1bca50d79d 100644 --- a/agent/mmc/plugins/ppolicy/__init__.py +++ b/agent/mmc/plugins/ppolicy/__init__.py @@ -46,7 +46,7 @@ logger = logging.getLogger() -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "0:1:0" REVISION = scmRevision("$Rev$") diff --git a/agent/mmc/plugins/report/__init__.py b/agent/mmc/plugins/report/__init__.py index 4696e12bbf..81e2f1a3e6 100644 --- a/agent/mmc/plugins/report/__init__.py +++ b/agent/mmc/plugins/report/__init__.py @@ -43,7 +43,7 @@ from mmc.plugins.report.database import ReportDatabase from mmc.plugins.report.output import XLSGenerator, PDFGenerator, SVGGenerator -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "0:1:0" REVISION = scmRevision("$Rev$") diff --git a/agent/mmc/plugins/services/__init__.py b/agent/mmc/plugins/services/__init__.py index 1f527fb2b9..71813b2d07 100644 --- a/agent/mmc/plugins/services/__init__.py +++ b/agent/mmc/plugins/services/__init__.py @@ -34,7 +34,7 @@ logger = logging.getLogger() -VERSION = "4.6.6" +VERSION = "4.6.7" APIVERSION = "0:1:0" REVISION = "" diff --git a/build_sdist.sh b/build_sdist.sh index 5e1ed03263..e550e6f369 100755 --- a/build_sdist.sh +++ b/build_sdist.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION='4.6.6' +VERSION='4.6.7' rm -f pulse2-*.tar.gz pulse2-*.tar.gz.md5 git clean -fdx && ./autogen.sh && ./configure --sysconfdir=/etc --localstatedir=/var --disable-python-check --disable-conf && make distcheck diff --git a/configure.ac b/configure.ac index 7029ba0edf..5ce5e9e510 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.59) dnl autoconf initialization define([project], [pulse2]) -AC_INIT(project, [4.6.6], [http://www.siveo.net]) +AC_INIT(project, [4.6.7], [http://www.siveo.net]) define([gitversion], esyscmd([sh -c "which git > /dev/null && git describe 2> /dev/null | sed -e 's/]project[-\([^-]\+\)//' | tr -d '\n' || true"]))dnl AC_DEFINE(GITVERSION, "gitversion", [Git version]) diff --git a/packaging/rpm/rhel/SPECS/pulse2.spec b/packaging/rpm/rhel/SPECS/pulse2.spec index bd7adb5c6e..6f738ab0d9 100644 --- a/packaging/rpm/rhel/SPECS/pulse2.spec +++ b/packaging/rpm/rhel/SPECS/pulse2.spec @@ -25,8 +25,8 @@ %define use_git 1 %define git SHA -%define real_version 4.6.6 -%define mmc_version 4.6.6 +%define real_version 4.6.7 +%define mmc_version 4.6.7 Summary: Management Console Name: pulse2 diff --git a/setup.py b/setup.py index 65b7aa0c59..4bc63f5952 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ keywords='pulse2', name='pulse2', - version='4.6.6', + version='4.6.7', debian_distro='stretch', description = 'pulse2', url='https://www.siveo.net/', diff --git a/web/modules/admin/infoPackage.inc.php b/web/modules/admin/infoPackage.inc.php index e07946b056..f761c2c188 100644 --- a/web/modules/admin/infoPackage.inc.php +++ b/web/modules/admin/infoPackage.inc.php @@ -21,7 +21,7 @@ require_once("modules/pulse2/version.php"); $mod = new Module("admin"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); //$mod->setRevision(''); $mod->setDescription(_T("Admin", "admin")); $mod->setAPIVersion("1:0:0"); diff --git a/web/modules/base/infoPackage.inc.php b/web/modules/base/infoPackage.inc.php index 556cd561db..bea89be9a8 100644 --- a/web/modules/base/infoPackage.inc.php +++ b/web/modules/base/infoPackage.inc.php @@ -31,7 +31,7 @@ * module declaration */ $mod = new Module("base"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); $mod->setRevision('$Rev$'); $mod->setAPIVersion("9:0:5"); $mod->setDescription(_("User, group and computer management")); diff --git a/web/modules/dashboard/infoPackage.inc.php b/web/modules/dashboard/infoPackage.inc.php index fbcdc3d007..77fe78a011 100644 --- a/web/modules/dashboard/infoPackage.inc.php +++ b/web/modules/dashboard/infoPackage.inc.php @@ -31,7 +31,7 @@ $main = &$base->getSubmod('main'); $mod = new Module("dashboard"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); $mod->setRevision(''); $mod->setDescription(_T("Dashboard", "dashboard")); $mod->setAPIVersion("0:0:0"); diff --git a/web/modules/ppolicy/infoPackage.inc.php b/web/modules/ppolicy/infoPackage.inc.php index 7d977769ad..edf5125963 100644 --- a/web/modules/ppolicy/infoPackage.inc.php +++ b/web/modules/ppolicy/infoPackage.inc.php @@ -31,7 +31,7 @@ $mod = new Module("ppolicy"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); $mod->setRevision('$Rev$'); $mod->setDescription(_T("Password Policy", "ppolicy")); $mod->setAPIVersion("0:1:0"); diff --git a/web/modules/report/infoPackage.inc.php b/web/modules/report/infoPackage.inc.php index dcfb8ecdc8..e5d2e2625c 100644 --- a/web/modules/report/infoPackage.inc.php +++ b/web/modules/report/infoPackage.inc.php @@ -27,7 +27,7 @@ $MMCApp =& MMCApp::getInstance(); $mod = new Module("report"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); $mod->setRevision(''); $mod->setDescription(_T("Reporting", "report")); $mod->setAPIVersion("0:0:0"); diff --git a/web/modules/services/infoPackage.inc.php b/web/modules/services/infoPackage.inc.php index 8652aff0f5..fccf7225de 100644 --- a/web/modules/services/infoPackage.inc.php +++ b/web/modules/services/infoPackage.inc.php @@ -27,7 +27,7 @@ $MMCApp =& MMCApp::getInstance(); $mod = new Module("services"); -$mod->setVersion("4.6.6"); +$mod->setVersion("4.6.7"); $mod->setRevision(''); $mod->setDescription(_T("Services management", "services")); $mod->setAPIVersion("0:0:0");