From 4bfe7351d79b95f4d1e2367cfbd41f9557627b95 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 25 Feb 2020 11:02:53 -0800
Subject: [PATCH] Updating CHANGES and VERSION.

---
 CHANGES           | 20 ++++++++++++++++++++
 VERSION           |  2 +-
 broker/version.hh |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 82764823..353469a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,24 @@
 
+1.2.5 | 2020-02-22 16:07:31 -0800
+
+  * Release v1.2.5
+
+  * Fix accidential error/log output (Dominik Charousset, Corelight)
+
+  * GH-85: Improve python bindings Event validity checks (Jon Siwek, Corelight)
+
+    This adds a valid() method to broker.zeek.Event objects that may be
+    called after creating them to check if the data it parsed was valid
+    event data.
+
+    Also extended the name() and args() methods of broker.zeek.Event to
+    first check for validity to avoid segfaulting.  If the validity check
+    fails, a ValueError exception is now thrown.
+
+  * Update RTD version labels for LTS (Jon Siwek, Corelight)
+
+  * Display version number for more RTD version labels (Jon Siwek, Corelight)
+
 1.2.4 | 2019-11-26 09:29:18 -0800
 
   * Update embedded CAF to 0.16.5 for OpenBSD fixes (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index e8ea05db..c813fe11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/broker/version.hh b/broker/version.hh
index e0c662c5..84e4a123 100644
--- a/broker/version.hh
+++ b/broker/version.hh
@@ -11,7 +11,7 @@ using type = unsigned;
 
 constexpr type major = 1;
 constexpr type minor = 2;
-constexpr type patch = 4;
+constexpr type patch = 5;
 constexpr auto suffix = "";
 
 constexpr type protocol = 2;