merge from master

Author: longshanksmo

CHANGELOG.md

@@ -6,23 +6,24 @@ v6.0.5
 
 增加私有资源fop的接口，包括exif,imageInfo,ImageView
 
-v6.0.4
+### v6.0.4
 
-2013-08-21 issue [#77](https://github.com/qiniu/java-sdk/pull/77)
+2013-09-02 issue [#78](https://github.com/qiniu/java-sdk/pull/78)
 
-添加ListPrefix
+- 添加ListPrefix
+- hot fix,增加EndUser字段至PutPolicy的JSON字符串中
 
 ### v6.0.3
 
 2013-08-5 issue [#76](https://github.com/qiniu/java-sdk/pull/76)
 
-Bug fix，编码强制UTF-8修复
+- Bug fix，编码强制UTF-8修复
 
 ### v6.0.1
 
 2013-08-5 issue [#74](https://github.com/qiniu/java-sdk/pull/74)
 
-Bug fix，增加PutPolicy类的 callbackBody字段到PutPolicy的Json格式中
+- Bug fix，增加PutPolicy类的 callbackBody字段到PutPolicy的Json格式中
 
 
 ### v6.0.0

src/main/java/com/qiniu/api/rs/PutPolicy.java

@@ -56,6 +56,9 @@ private String marshal() throws JSONException {
 		if (this.asyncOps != null && this.asyncOps.length() > 0) {
 			stringer.key("asyncOps").value(this.asyncOps);
 		}
+		if (this.endUser != null && this.endUser.length() > 0) {
+			stringer.key("endUser").value(this.endUser);
+		}
 		stringer.key("deadline").value(this.expires);
 		stringer.endObject();