From 533e0b42e2cb58c62596a401d18193c59eddcc69 Mon Sep 17 00:00:00 2001
From: Xuanwo <xuanwo@yunify.com>
Date: Tue, 10 Jan 2017 23:32:45 +0800
Subject: [PATCH] Bump to version 1.2.0

Signed-off-by: Xuanwo <xuanwo@yunify.com>
---
 CHANGELOG.md | 12 ++++++++++++
 setup.py     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03a17bfb..8444d050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - 2017-01-10
+
+### Added
+
+- Support to upload file from stdin
+
+### Fixed
+
+- Fix bug that list_keys do not respect prefix
+- Fix empty output while access_key_id is invalid
+
 ## [1.1.0] - 2017-01-09
 
 ### Changed
@@ -51,6 +62,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Hello, qsctl.
 
+[1.2.0]: https://github.com/yunify/qsctl/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/yunify/qsctl/compare/2cc5fe3c912dc37356d332b103c0f132e1058c63...1.1.0
 [1.0.5]: https://github.com/yunify/qsctl/compare/82d42dcaaec9d58c8fdd6cad82bac56092416ff6...2cc5fe3c912dc37356d332b103c0f132e1058c63
 [1.0.4]: https://github.com/yunify/qsctl/compare/3073a03e7d2d801226c525e574f9bba295e12ddd...82d42dcaaec9d58c8fdd6cad82bac56092416ff6
diff --git a/setup.py b/setup.py
index 3e4bf50c..6f581b66 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='qsctl',
-    version='1.1.0',
+    version='1.2.0',
     description='Advanced command line tool for QingStor.',
     long_description=open('README.rst', 'rb').read().decode('utf-8'),
     keywords='yunify qingcloud qingstor qsctl object_storage',