From a8c2b1a378113b8d7d70732e2e772655197be97d Mon Sep 17 00:00:00 2001
From: Stefan Eberl <stefan.eberl@dynatrace.com>
Date: Mon, 6 Apr 2020 09:13:01 +0200
Subject: [PATCH] Merge pull request #74 in OP/openkit-native from
 prepare-release-1.1.7 to release/1.1

* commit 'd479744abc996c7b3d6fceb74386e09512a4f44a':
  Prepare release 1.1.7

GitOrigin-RevId: d9cd1fcce55d1dc6dde51e38563270a699b2a6e9
---
 CHANGELOG.md       | 5 ++++-
 appveyor.yml       | 2 +-
 docs/example.md    | 8 ++++----
 version.properties | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56803629..42c4a172 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # OpenKit Native ( C/C++ ) Changelog
 
-## [Unreleased](https://github.com/Dynatrace/openkit-native/compare/v1.1.6...release/1.1)
+## [Unreleased](https://github.com/Dynatrace/openkit-native/compare/v1.1.7...release/1.1)
+
+## 1.1.7 [Release date: 2020-04-06]
+[GitHub Releases](https://github.com/Dynatrace/openkit-native/releases/tag/v1.1.7)
 
 ### Changed
 - Fixed issue with reporting localized beacon data  
diff --git a/appveyor.yml b/appveyor.yml
index d754469e..a76009f3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.1.6.{build}
+version: 1.1.7.{build}
 
 # Build with Visual Studio 2017
 image: Visual Studio 2017
diff --git a/docs/example.md b/docs/example.md
index 7040e2b1..1494b1a0 100644
--- a/docs/example.md
+++ b/docs/example.md
@@ -99,8 +99,8 @@ This includes device specific information like operating system, manufacturer, o
 
 | Method Name | Description | Default Value |
 | ------------- | ------------- | ---------- |
-| `withApplicationVersion`  | sets the application version  | `"1.1.6"` |
-| `withOperatingSystem`  | sets the operating system name | `"OpenKit 1.1.6"` |
+| `withApplicationVersion`  | sets the application version  | `"1.1.7"` |
+| `withOperatingSystem`  | sets the operating system name | `"OpenKit 1.1.7"` |
 | `withManufacturer`  | sets the manufacturer | `"Dynatrace"` |
 | `withModelID`  | sets the model id  | `"OpenKitDevice"` |
 | `withBeaconCacheMaxRecordAge`  | sets the maximum age of an entry in the beacon cache in milliseconds | 1 h 45 min |
@@ -115,8 +115,8 @@ When using the OpenKit C API, additional configuration can applied to the config
 
 | Parameter Name | Description | Default Value |
 | ------------- | ------------- | ---------- |
-| `useApplicationVersionForConfiguration`  | sets the application version  | `"1.1.6"` is used when argument is `NULL` |
-| `useOperatingSystemForConfiguration`  | sets the operating system name | `"OpenKit 1.1.6"` is used when argument is `NULL` |
+| `useApplicationVersionForConfiguration`  | sets the application version  | `"1.1.7"` is used when argument is `NULL` |
+| `useOperatingSystemForConfiguration`  | sets the operating system name | `"OpenKit 1.1.7"` is used when argument is `NULL` |
 | `useManufacturerForConfiguration`  | sets the manufacturer | `"Dynatrace"` is used when argument is `NULL` |
 | `useModelIDForConfiguration`  | sets the model id  | `"OpenKitDevice"` is used when argument is `NULL` |
 | `useBeaconCacheMaxRecordAgeForConfiguration`  | sets the maximum age of an entry in the beacon cache in milliseconds | 1 h 45 min when argument is less than 0 |
diff --git a/version.properties b/version.properties
index d282a1c1..818c4ec8 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version=1.1.6
\ No newline at end of file
+version=1.1.7
\ No newline at end of file