From 011c0ccf276bb818ec0a975356c789493a83ba3b Mon Sep 17 00:00:00 2001
From: Brian Shumate <brian@brianshumate.com>
Date: Fri, 30 Aug 2019 11:44:28 -0400
Subject: [PATCH] Consul v1.6.0

---
 CHANGELOG.md               | 4 +++-
 README.md                  | 4 ++--
 defaults/main.yml          | 2 +-
 examples/README_VAGRANT.md | 2 +-
 version.txt                | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78dae3a1..af0ed178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
-## NEXT
+## v2.5.0
 
+- Consul v1.6.0
 - Add documentation for new TLS options (thanks @jasonneurohr)
 - Add support for translate_wan_address (@calmacara)
+- Add `-log-file` (thanks @liuxu623)
 
 ## v2.4.5
 
diff --git a/README.md b/README.md
index f2821fa7..4a278cb2 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ This role requires a FreeBSD, Debian, or Red Hat Enterprise Linux distribution o
 
 The role might work with other OS distributions and versions, but is known to function well with the following software versions:
 
-* Consul: 1.5.3
+* Consul: 1.6.0
 * Ansible: 2.8.2
 * Alpine Linux: 3.8
 * CentOS: 7
@@ -64,7 +64,7 @@ Many role variables can also take their values from environment variables as wel
 ### `consul_version`
 
 - Version to install
-- Default value: 1.5.3
+- Default value: 1.6.0
 
 ### `consul_architecture_map`
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 013aa1c5..aad287d0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,7 +7,7 @@ is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}"
 consul_install_dependencies: true
 
 ### Package
-consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.5.3', true) }}"
+consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.6.0', true) }}"
 consul_architecture_map:
   # this first entry seems redundant
   # (but it's required for reasons)
diff --git a/examples/README_VAGRANT.md b/examples/README_VAGRANT.md
index 7eae2d3a..e7ceff7b 100644
--- a/examples/README_VAGRANT.md
+++ b/examples/README_VAGRANT.md
@@ -90,7 +90,7 @@ BOX_NAME=freebsd/FreeBSD-11.0-STABLE CONSUL_IFACE=em1 vagrant up
 ## Notes
 
 1. This project functions with the following software versions:
-  * Consul version 1.5.3
+  * Consul version 1.6.0
   * Ansible: 2.8.2
   * VirtualBox version 5.2.22
   * Vagrant version 2.2.1
diff --git a/version.txt b/version.txt
index 1ebfe474..21222cee 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.4.5
+v2.5.0