Skip to content

Commit

Permalink
Merge pull request #1885 from cyberark/release-1.10.0
Browse files Browse the repository at this point in the history
Release v1.10.0
  • Loading branch information
micahlee authored Oct 16, 2020
2 parents 257237a + dc79510 commit 19676fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.10.0] - 2020-10-16
### Added
- [Documentation](./UPGRADING.md) explaining how to upgrade a Conjur server deployed in a
Docker Compose environment. [cyberark/conjur#1528](https://github.com/cyberark/conjur/issues/1528), [cyberark/conjur#1584](https://github.com/cyberark/conjur/issues/1584)
Expand Down Expand Up @@ -443,7 +445,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- The first tagged version.

[Unreleased]: https://github.com/cyberark/conjur/compare/v1.9.0...HEAD
[Unreleased]: https://github.com/cyberark/conjur/compare/v1.10.0...HEAD
[1.10.0]: https://github.com/cyberark/conjur/compare/v1.9.0...v1.10.0
[1.9.0]: https://github.com/cyberark/conjur/compare/v1.8.1...v1.9.0
[1.8.1]: https://github.com/cyberark/conjur/compare/v1.7.0...v1.8.1
[1.8.0]: https://github.com/cyberark/conjur/compare/v1.7.4...v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.0
1.10.0

0 comments on commit 19676fc

Please sign in to comment.