Skip to content

Commit

Permalink
docs: Incorporates changes from version v1.0.0-beta.3-3-g3c0c862
Browse files Browse the repository at this point in the history
  • Loading branch information
ORY Continuous Integration committed Jun 14, 2018
1 parent 3c0c862 commit e1127a8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:**

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e1127a8

Please sign in to comment.