upgrade pomelo to 1.1.0

Change-Id: I43bf8c61897c5eb2e767e4809e7ea9b96befc1c6
seraphcxl · Sep 12, 2014 · db62dfc · db62dfc
1 parent cd5a46b
commit db62dfc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,14 @@
+1.1.0 / 2014-09-12
+=================
+* [NEW] fit for libpomelo2
+* [NEW] upgrade pomelo-rpc to 0.4.5
+  [#612](https://github.com/NetEase/pomelo/pull/612)
+* [FIX] close http server after WebSocketServer.close
+  [#613](https://github.com/NetEase/pomelo/pull/613)
+* [FIX] update timeout.js
+  [#614](https://github.com/NetEase/pomelo/pull/614)
+* [FIX] fix typo
+
 1.0.4 / 2014-08-26
 =================
 * [NEW] upgrade pomelo-rpc to 0.4.3

diff --git a/lib/pomelo.js b/lib/pomelo.js
@@ -24,7 +24,7 @@ var Pomelo = module.exports = {};
  * Framework version.
  */
 
-Pomelo.version = '1.0.4';
+Pomelo.version = '1.1.0';
 
 /**
  * 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.0.4",
+  "version": "1.1.0",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {