Merge branch 'development' of https://github.com/Unitech/PM2 into development

.travis.yml

@@ -1,17 +1,17 @@
 language: node_js
 branches:
   only:
+    - poc-plugin
     - master
     - development
     - api
     - travis
 node_js:
-   - "0.12.0"
+   - "0.12"
    - "0.11"
-   - "0.11.14"
+   - "0.11.15"
    - "0.10"
-   - "0.10.36"
-   - "iojs"
+   - "0.10.35"
 os:
   - linux
   - osx

test/interface/fixtures/http:transaction.js

@@ -6,7 +6,9 @@ var http = require('http');
 
 http.createServer(function(req, res) {
   res.writeHead(200);
-  res.end('transaction');
+  setTimeout(function() {
+    res.end('transaction');
+  }, 1000);
 }).listen(9010);
 
 setInterval(function() {