From cdad1df1bf6556d37153b73c573c661192ad5523 Mon Sep 17 00:00:00 2001
From: yuqing <yuqing@yongche.com>
Date: Mon, 17 Apr 2017 10:46:07 +0800
Subject: [PATCH] upgrade version to 1.26

---
 pom.xml     | 4 ++--
 src/HISTORY | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index abf1b16..a64f34c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.csource</groupId>
     <artifactId>fastdfs-client-java</artifactId>
-    <version>1.25</version>
+    <version>1.26</version>
     <name>fastdfs-client-java</name>
     <description>fastdfs client with java</description>
     <packaging>jar</packaging>
@@ -49,4 +49,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/HISTORY b/src/HISTORY
index e134b45..93ecb4a 100644
--- a/src/HISTORY
+++ b/src/HISTORY
@@ -1,4 +1,8 @@
 
+Version 1.26  2017-04-17
+  * IniFileReader use getResourceAsStream first
+  * change charactor encoding to UTF-8
+
 Version 1.25  2014-12-07
   * support connection stats since FastDFS Server v5.04