From b7f8b2dcdd96921ad82b6c3de181ee97abcd7884 Mon Sep 17 00:00:00 2001
From: Mr-DaveDev <MotionMrDaveDev@gmail.com>
Date: Sun, 9 Dec 2018 10:15:16 -0700
Subject: [PATCH] Version 4.2.1

---
 CHANGELOG  | 17 +++++++++++++++++
 version.sh |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1045a89d5..18c590e1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+Summary of changes for version 4.2.1 are below
+   * Update version number to 4.2.1 / Changelog
+   * Report to log options included in build
+   * Add log messages on database actions(tosiara)
+   * Revise log messages of port used for stream
+   * Revise log messages when using v4l2 via netcam
+   * Fix null terminator on EXIF of jpgs(tosiara)
+   * Fix build with static libs for webp(Fabrice)
+   * Guide update for initial setup.
+   * Prevent webcontrol update of movie_passthrough
+   * Remove confusing log message
+   * Fix motion detection when using privacy mask
+   * Correct thread locking for movie_passthrough
+   * Revise guide for better mobile viewing
+   * Revise additional stream timing
+   * Fix stream timing(adameat)
+   * Remove obsolete function reference
    * Change version number to 4.2+git
 Summary of Changes for version 4.2 are below
    * html fixes for legacy interface
diff --git a/version.sh b/version.sh
index c6b1aa188..6a4b855c3 100755
--- a/version.sh
+++ b/version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_VERSION="4.2"
+BASE_VERSION="4.2.1"
 if [ -d .git ]; then
     if test "`git diff --name-only`" = "" ; then
         GIT_COMMIT="git"
@@ -13,5 +13,5 @@ if [ -d .git ]; then
 else
     GIT_COMMIT="gitUNKNOWN"
 fi
-#printf "$BASE_VERSION"
-printf "$BASE_VERSION+$GIT_COMMIT"
+printf "$BASE_VERSION"
+#printf "$BASE_VERSION+$GIT_COMMIT"