Skip to content

Commit

Permalink
Merge pull request #73 in OP/openkit-native from prepare-release-1.0.…
Browse files Browse the repository at this point in the history
…5 to release/1.0

* commit '748e3e0b36a320aaa81d9ea198679ebf69dd504e':
  Increase version to 1.0.5

GitOrigin-RevId: ebbe74cb4f23ba28622363b13fbc29face5c771a
  • Loading branch information
stefaneberl authored and openkitdt committed Apr 6, 2020
1 parent 7a36d96 commit f532710
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# OpenKit Native ( C/C++ ) Changelog

## [Unreleased](https://github.com/Dynatrace/openkit-native/compare/v1.0.4...release/1.0)
## [Unreleased](https://github.com/Dynatrace/openkit-native/compare/v1.0.5...release/1.0)

## 1.0.5 [Release date: 2020-04-06]
[GitHub Releases](https://github.com/Dynatrace/openkit-native/releases/tag/v1.0.5)

### Changed
- Fix incorrect check in C-API's useBeaconCacheBehaviorForConfiguration function when setting the
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.0.4.{build}
version: 1.0.5.{build}

# Build with Visual Studio 2017
image: Visual Studio 2017
Expand Down
8 changes: 4 additions & 4 deletions docs/example.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4"` |
| `withOperatingSystem` | sets the operating system name | `"OpenKit 1.0.4"` |
| `withApplicationVersion` | sets the application version | `"1.0.5"` |
| `withOperatingSystem` | sets the operating system name | `"OpenKit 1.0.5"` |
| `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 |
Expand All @@ -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.0.4"` is used when argument is `NULL` |
| `useOperatingSystemForConfiguration` | sets the operating system name | `"OpenKit 1.0.4"` is used when argument is `NULL` |
| `useApplicationVersionForConfiguration` | sets the application version | `"1.0.5"` is used when argument is `NULL` |
| `useOperatingSystemForConfiguration` | sets the operating system name | `"OpenKit 1.0.5"` 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 |
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=1.0.4
version=1.0.5

0 comments on commit f532710

Please sign in to comment.