tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

Browse Source
This commit is contained in:
m-lopez-f 2015-04-08 09:31:58 +02:00
commit 45289330bd
23 changed files with 28 additions and 23 deletions

2
pandora_agents/unix/DEBIAN/control

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 6.0dev-150406
Version: 6.0dev-150408
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150406"
pandora_version="6.0dev-150408"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '6.0dev';
use constant AGENT_BUILD => '150406';
use constant AGENT_BUILD => '150408';
# Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => {

2
pandora_agents/unix/pandora_agent.redhat.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0dev
%define release 150406
%define release 150408
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0dev
%define release 150406
%define release 150408
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/win32/installer/pandora.mpi

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{150406}
{150408}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("6.0dev(Build 150406)")
#define PANDORA_VERSION ("6.0dev(Build 150408)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(6.0dev(Build 150406))"
VALUE "ProductVersion", "(6.0dev(Build 150408))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 6.0dev-150406
Version: 6.0dev-150408
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150406"
pandora_version="6.0dev-150408"
package_pear=0
package_pandora=1

2
pandora_console/include/config_process.php

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC150406';
$build_version = 'PC150408';
$pandora_version = 'v6.0dev';
// Do not overwrite default timezone set if defined.

2
pandora_console/install.php

@ -63,7 +63,7 @@
<div style='height: 10px'>
<?php
$version = '6.0dev';
$build = '150406';
$build = '150408';
$banner = "v$version Build $build";
error_reporting(0);

7
pandora_console/operation/agentes/ver_agente.php

@ -246,7 +246,12 @@ if (is_ajax ()) {
foreach ($idAgents as $idA) {
if (empty($metaconsole_server_name)) {
$row = explode ('|', $idA);
if (strstr($idA, "|@_@|")) {
$row = explode ('|@_@|', $idA);
}
else {
$row = explode ('|', $idA);
}
$server_name = $row[0];
$id_agent = $row [1];
}

2
pandora_console/pandora_console.redhat.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
%define release 150406
%define release 150408
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
%define release 150406
%define release 150408
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_console/pandoradb_data.sql

@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('graph_res','5'),
('step_compact','1'),
('db_scheme_version','6.0dev'),
('db_scheme_build','PD150406'),
('db_scheme_build','PD150408'),
('show_unknown','0'),
('show_lastalerts','1'),
('style','pandora'),

2
pandora_server/DEBIAN/control

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 6.0dev-150406
Version: 6.0dev-150408
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150406"
pandora_version="6.0dev-150408"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "6.0dev";
my $pandora_build = "150406";
my $pandora_build = "150408";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/pandora_server.redhat.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
%define release 150406
%define release 150408
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
%define release 150406
%define release 150408
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/util/pandora_db.pl

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
my $version = "6.0dev PS150406";
my $version = "6.0dev PS150408";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl

@ -35,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "6.0dev PS150406";
my $version = "6.0dev PS150408";
# save program name for logging
my $progname = basename($0);