From e13c3c35ddc306990fa28cdf9eafe53e2f32926f Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Fri, 9 Mar 2018 21:32:03 +0100
Subject: [PATCH] - updated CHANGELOG; updated version number to 1.1.2

---
 CHANGELOG                                      | 10 ++++++++++
 CMakeLists.txt                                 |  2 +-
 dotnet/IEC61850forCSharp/AssemblyInfo.cs       |  2 +-
 src/common/inc/libiec61850_platform_includes.h |  2 +-
 src/doxygen.config                             |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 25ac39bf3..82a9df06e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+Changes to version 1.1.2
+------------------------
+
+- MMS client: fixed parsing initiate response message
+- SV publisher: conditional encoding for SmpRate
+- MmsValue_update function now allows adjusting octet-string size of target object
+- .NET API: Added DeleteFile 
+- CDC helper functions: added helper functions for VSS and VSG CDC
+- added additional locks in client and server
+
 Changes to version 1.1.1
 ------------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95e479836..dc36f99dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ ENABLE_TESTING()
 
 set(LIB_VERSION_MAJOR "1")
 set(LIB_VERSION_MINOR "1")
-set(LIB_VERSION_PATCH "1")
+set(LIB_VERSION_PATCH "2")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/third_party/cmake/modules/")
 
diff --git a/dotnet/IEC61850forCSharp/AssemblyInfo.cs b/dotnet/IEC61850forCSharp/AssemblyInfo.cs
index 479370f2f..6bd36577b 100644
--- a/dotnet/IEC61850forCSharp/AssemblyInfo.cs
+++ b/dotnet/IEC61850forCSharp/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.1.2")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/src/common/inc/libiec61850_platform_includes.h b/src/common/inc/libiec61850_platform_includes.h
index 68526a4b4..fff608f90 100644
--- a/src/common/inc/libiec61850_platform_includes.h
+++ b/src/common/inc/libiec61850_platform_includes.h
@@ -15,7 +15,7 @@
 
 #include "platform_endian.h"
 
-#define LIBIEC61850_VERSION "1.1.1"
+#define LIBIEC61850_VERSION "1.1.2"
 
 #ifndef CONFIG_DEFAULT_MMS_VENDOR_NAME
 #define CONFIG_DEFAULT_MMS_VENDOR_NAME "libiec61850.com"
diff --git a/src/doxygen.config b/src/doxygen.config
index 69580e5dc..4a0c2a288 100644
--- a/src/doxygen.config
+++ b/src/doxygen.config
@@ -18,7 +18,7 @@ DOXYFILE_ENCODING      = UTF-8
 
 PROJECT_NAME           = "libIEC61850"
 
-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2
 
 PROJECT_BRIEF          = "Open-source IEC 61850 MMS/GOOSE/SV server and client library"