bump version to 1.1.1

Change-Id: I780870f527614bdc687c50551e006ff3254136cf
NetEase · Oct 10, 2014 · f132be6 · f132be6
1 parent ce9797e
commit f132be6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,13 @@
+1.1.1 / 2014-10-10
+=================
+* [NEW] upgrade pomelo-protocol to 0.1.4
+  [#616](https://github.com/NetEase/pomelo/pull/616)
+* [FIX] incorrect this scope
+  [#622](https://github.com/NetEase/pomelo/pull/622)
+* [FIX] fix bug on arg parse
+  [#623](https://github.com/NetEase/pomelo/pull/623)
+* [FIX] connection without communication bug
+
 1.1.0 / 2014-09-12
 =================
 * [NEW] fit for libpomelo2

diff --git a/lib/pomelo.js b/lib/pomelo.js
@@ -24,7 +24,7 @@ var Pomelo = module.exports = {};
  * Framework version.
  */
 
-Pomelo.version = '1.1.0';
+Pomelo.version = '1.1.1';
 
 /**
  * Event definitions that would be emitted by app.event

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {