From c8ec6f4b41e447f9c968139ff35bde024fd00325 Mon Sep 17 00:00:00 2001
From: netniV <netniv@hotmail.com>
Date: Sun, 2 Aug 2020 22:24:44 +0000
Subject: [PATCH] Update for release 1.2.14

---
 CHANGELOG                 | 11 +++++------
 include/cacti_version     |  2 +-
 include/global_arrays.php |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f41635b462..e5c418446a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,16 +1,15 @@
 Cacti CHANGELOG
 
 1.2.14
--issue#3695: Spikekill `percent` is converted from percent to decimal twice, making it 1/100 of the true size
--issue#3676: Device not showing up in device page but showing up in Monitor tab (continued)
+-issue#3676: Device not showing up in device page but showing up in Monitor tab
 -issue#3678: More or Equal incorrect highlighting max_heap_table_size and tmp_table_size
+-issue#3694: Spikekill `percent` is converted from percent to decimal twice, making it 1/100 of the true size
+-issue#3713: When sorting data debug checks by user, no results are shown and errors recorded
 -issue#3719: When tooltip is too long, the scroll bar exists, and cannot be scrolled, which makes the tooltip be hided
 -issue#3723: Improper escaping of error message leads to XSS during template import preview
--issue#3713: When sorting data debug checks by user, no results are shown and errors recorded
 -issue#3728: Invalid uptime is not handled properly
--issue#3737: Poller functions may not run if process table is missing
--feature#3619: Spikekill percent does not go high enough
--feature#3615: Spikekill user options differ from Spikekill global options
+-issue#3737: Poller functions may not run if 'processes' table is missing
+-feature#3615: Poller keeps using old IP address for a device
 
 1.2.13
 -security#3544: jQuery XSS vulnerabilities require vendor package update (CVE-2020-11022 / CVE-2020-11023)
diff --git a/include/cacti_version b/include/cacti_version
index 0b1f1edf11..fd9d1a5aca 100644
--- a/include/cacti_version
+++ b/include/cacti_version
@@ -1 +1 @@
-1.2.13
+1.2.14
diff --git a/include/global_arrays.php b/include/global_arrays.php
index 8b78ae3985..86e50e843c 100644
--- a/include/global_arrays.php
+++ b/include/global_arrays.php
@@ -126,6 +126,7 @@
 	'1.2.11'  => '0102',
 	'1.2.12'  => '0102',
 	'1.2.13'  => '0102',
+	'1.2.14'  => '0102',
 );
 
 $messages = array(