From 74bce553960ee8f0d46fec5384269873de81214d Mon Sep 17 00:00:00 2001
From: fengmk2 <m@fengmk2.com>
Date: Tue, 9 Aug 2016 17:20:20 +0800
Subject: [PATCH] Release 2.6.0

---
 AUTHORS      | 1 +
 History.md   | 6 ++++++
 package.json | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 044e1c8..3ae30c8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 fengmk2 <m@fengmk2.com> (https://fengmk2.com)
 dead-horse <heyiyu.deadhorse@gmail.com> (https://github.com/dead-horse)
+凯 方 <fkvsssl@126.com> (https://github.com/fangk)
 
diff --git a/History.md b/History.md
index 4d371ab..5f2a6b0 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 
+2.6.0 / 2016-08-09
+==================
+
+  * feat: support query(sql, object) (#12)
+  * test: use travis ci local mysql server (#13)
+
 2.5.0 / 2016-06-07
 ==================
 
diff --git a/package.json b/package.json
index c29ab2a..7495433 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ali-rds",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Aliyun RDS client",
   "main": "lib/client.js",
   "files": [