tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/NewView

This commit is contained in:
m-lopez-f 2015-06-25 10:49:45 +02:00
parent 94c742bfbe 0ed704cc68
commit b3c0d99fd2
25 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

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

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="6.0dev-150624"
pandora_version="6.0dev-150625"
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
View File

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

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

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

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{150624}
{150625}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

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

2
pandora_console/DEBIAN/control
View File

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

2
pandora_console/DEBIAN/make_deb_package.sh
View File

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

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/include/functions_ui.php
View File

@ -1411,6 +1411,8 @@ function ui_process_page_head ($string, $bitfield) {
//Load intro.js library (for bubbles and clippy)
$config['js']['intro'] = "include/javascript/intro.js";
$config['js']['clippy'] = "include/javascript/clippy.js";
//Load Underscore.js library
$config['js']['underscore'] = "include/javascript/underscore-min.js";
//Load other javascript

6
pandora_console/include/javascript/underscore-min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
pandora_console/include/javascript/underscore-min.map Normal file
View File

File diff suppressed because one or more lines are too long

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

2
pandora_console/pandoradb_data.sql
View File

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

2
pandora_server/DEBIAN/control
View File

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

2
pandora_server/DEBIAN/make_deb_package.sh
View File

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

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -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 = "150624";
my $pandora_build = "150625";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/util/pandora_db.pl
View File

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

2
pandora_server/util/pandora_manage.pl
View File

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