From 1752c2773bd948da88780e7e765eecffe78d2846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <ondrej.novy@firma.seznam.cz>
Date: Wed, 21 Sep 2016 21:43:52 +0200
Subject: [PATCH] Release 1.2.0

Change-Id: Ifa251698f41c92a866bd98ac831b4b9359aa3f12
---
 AUTHORS   |  3 +++
 CHANGELOG | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 94ec3d0..ff1b471 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,9 +15,11 @@ Will Reese
 
 Contributors
 ------------
+Andreas Jaeger
 Andrew Clay Shafer
 Anne Gentle
 Apollon Oikonomopoulos
+Brian Cline
 Brian K. Jones
 Caleb Tennis
 Chmouel Boudjnah
@@ -48,3 +50,4 @@ SoftDed
 Soren Hansen
 Stephen Milton
 Thiago da Silva
+Zhang Guoqing
diff --git a/CHANGELOG b/CHANGELOG
index 2a0374f..52a0d90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+swauth (1.2.0)
+
+    Allow to set password by hash
+
+    Allow to set hash salt in config for S3 compatibility
+
+    Due to security reason, S3 support is disabled by default
+
+    Salt is not included in S3 HMAC computation
+
+    Use correct content type on JSON responses
+
+    Fix changing of auth_type in existing deployments
+
+    Remove outdated locale
+
 swauth (1.1.0)
 
     This is first release after move to OpenStack Infra