From 24da8b18186c0db464d08968a7a4a4ae1dd92d98 Mon Sep 17 00:00:00 2001
From: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
Date: Thu, 5 Jul 2018 09:48:25 +0200
Subject: [PATCH] release 1.6.1: add customized expiration time jwk_expires_in

used for Discovery documents and JWKs cache; thanks @dhlin

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
---
 .travis.yml                                              | 2 +-
 AUTHORS                                                  | 2 ++
 ChangeLog                                                | 9 ++++++---
 lib/resty/openidc.lua                                    | 2 +-
 ....6.0-1.rockspec => lua-resty-openidc-1.6.1-1.rockspec | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename lua-resty-openidc-1.6.0-1.rockspec => lua-resty-openidc-1.6.1-1.rockspec (97%)

diff --git a/.travis.yml b/.travis.yml
index 00ce0a2..c3812f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
 
 env:
   global:
-    - VERSION=1.6.0-1
+    - VERSION=1.6.1-1
     - NAME=lua-resty-openidc
     - ROCKSPEC=$NAME-$VERSION.rockspec
     - LUAROCKS=2.3.0
diff --git a/AUTHORS b/AUTHORS
index 34dc369..da102dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,5 @@ reporting bugs, providing fixes, suggesting useful features or other:
 	Venkatesh Marepalli <https://github.com/venkatmarepalli>
 	Grégoire Rolland <https://github.com/grrolland>
 	Patrice Amiel <https://github.com/pamiel>
+	Thomas Leplus <https://github.com/thomasleplus>
+	Donghang Lin <https://github.com/dhlin>
diff --git a/ChangeLog b/ChangeLog
index b846958..64ef700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
+07/05/2018
+- add customized expiration time option for discovery and jwk cache; thanks @dhlin
+- release 1.6.1
+
 06/26/2018
 - signature verification failed for RSA keys of a length different
-  from 2048 bit when the JWK used a specific format ; see #170
+  from 2048 bit when the JWK used a specific format; see #170
 
 06/19/2018
 - added post_logout_redirect_uri parameter that can be used to set
-  the target after logging out of the OpenID Connect Provider ; see #168;
-  thanks @thomasleplus
+  the target after logging out of the OpenID Connect Provider ; see #168; thanks @thomasleplus
 
 06/07/2018
 - refer to updated lua-resty-jwt that supports OpenSSL 1.1.x ; see: #162; thanks @cdbattags
diff --git a/lib/resty/openidc.lua b/lib/resty/openidc.lua
index 73b6d4c..321b90e 100644
--- a/lib/resty/openidc.lua
+++ b/lib/resty/openidc.lua
@@ -65,7 +65,7 @@ local supported_token_auth_methods = {
 }
 
 local openidc = {
-  _VERSION = "1.6.0"
+  _VERSION = "1.6.1"
 }
 openidc.__index = openidc
 
diff --git a/lua-resty-openidc-1.6.0-1.rockspec b/lua-resty-openidc-1.6.1-1.rockspec
similarity index 97%
rename from lua-resty-openidc-1.6.0-1.rockspec
rename to lua-resty-openidc-1.6.1-1.rockspec
index 7ef2d7b..9ddfdc8 100644
--- a/lua-resty-openidc-1.6.0-1.rockspec
+++ b/lua-resty-openidc-1.6.1-1.rockspec
@@ -1,8 +1,8 @@
 package = "lua-resty-openidc"
-version = "1.6.0-1"
+version = "1.6.1-1"
 source = {
     url = "git://github.com/zmartzone/lua-resty-openidc",
-    tag = "v1.6.0",
+    tag = "v1.6.1",
     dir = "lua-resty-openidc"
 }
 description = {