diff --git a/CHANGELOG.md b/CHANGELOG.md index 97a74e78bc..149100d2f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [Change Log](#change-log) - [Unreleased](#unreleased) + - [v1.0.0-beta.3 (2018-06-13)](#v100-beta3-2018-06-13) - [v1.0.0-beta.2 (2018-05-29)](#v100-beta2-2018-05-29) - [v1.0.0-beta.1 (2018-05-29)](#v100-beta1-2018-05-29) - [v0.11.12 (2018-05-07)](#v01112-2018-05-07) @@ -43,7 +44,18 @@ ## [Unreleased](https://github.com/ory/oathkeeper/tree/HEAD) -[Full Changelog](https://github.com/ory/oathkeeper/compare/v1.0.0-beta.2...HEAD) +[Full Changelog](https://github.com/ory/oathkeeper/compare/v1.0.0-beta.3...HEAD) + +**Implemented enhancements:** + +- cmd: Should not fatal if ORY Hydra SDK is unable to start [\#71](https://github.com/ory/oathkeeper/issues/71) + +**Merged pull requests:** + +- Reduces setup complexity [\#72](https://github.com/ory/oathkeeper/pull/72) ([arekkas](https://github.com/arekkas)) + +## [v1.0.0-beta.3](https://github.com/ory/oathkeeper/tree/v1.0.0-beta.3) (2018-06-13) +[Full Changelog](https://github.com/ory/oathkeeper/compare/v1.0.0-beta.2...v1.0.0-beta.3) **Merged pull requests:** diff --git a/README.md b/README.md index d3d509a4f7..0d79fcdb95 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This service is under active development and may introduce breaking changes in f - [Building from source](#building-from-source) - [Ecosystem](#ecosystem) - [ORY Security Console: Administrative User Interface](#ory-security-console-administrative-user-interface) - - [ORY Hydra: OAuth2 & OpenID Connect Server](#ory-hydra-oauth2-&-openid-connect-server) + - [ORY Hydra: OAuth2 & OpenID Connect Server](#ory-hydra-oauth2--openid-connect-server) - [ORY Keto: Access Control Policies as a Server](#ory-keto-access-control-policies-as-a-server) - [Security](#security) - [Disclosing vulnerabilities](#disclosing-vulnerabilities)