From a783de613c4d3992cf6b81fc6fe4ac3011facd15 Mon Sep 17 00:00:00 2001
From: Douglas Christopher Wilson <doug@somethingdoug.com>
Date: Tue, 5 May 2015 10:35:06 -0400
Subject: [PATCH 1/4] 2.7.0

---
 Changes.md   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changes.md b/Changes.md
index 3503a2a53..6d43d954c 100644
--- a/Changes.md
+++ b/Changes.md
@@ -4,7 +4,7 @@ This file is a manually maintained list of changes for each release. Feel free
 to add your changes here when sending pull requests. Also send corrections if
 you spot any mistakes.
 
-## HEAD
+## v2.7.0 (2015-05-05)
 
 * Destroy/end connections removed from the pool on error
 * Delay implied connect until after `.query` argument validation
diff --git a/package.json b/package.json
index 0946f8e41..49ded9c79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mysql",
   "description": "A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed.",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "license": "MIT",
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "contributors": [

From 59cd7e9885d6cf6f49982b21ed1847a5a4fb69ce Mon Sep 17 00:00:00 2001
From: Douglas Christopher Wilson <doug@somethingdoug.com>
Date: Wed, 13 May 2015 13:56:45 -0400
Subject: [PATCH 2/4] tests: fix event race condition in test streaming destroy

---
 test/FakeServer.js                        | 2 ++
 test/unit/query/test-streaming-destroy.js | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/FakeServer.js b/test/FakeServer.js
index a09ab3c33..074e9b9f2 100644
--- a/test/FakeServer.js
+++ b/test/FakeServer.js
@@ -340,6 +340,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
   var timer = setInterval(writeRow.bind(this), 20);
 
   this._socket.on('close', cleanup);
+  this._socket.on('error', cleanup);
 
   this._sendPacket(new Packets.ResultSetHeaderPacket({
     fieldCount: 2
@@ -366,6 +367,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
   function cleanup() {
     var socket = this._socket || this;
     socket.removeListener('close', cleanup);
+    socket.removeListener('error', cleanup);
     clearInterval(timer);
   }
 
diff --git a/test/unit/query/test-streaming-destroy.js b/test/unit/query/test-streaming-destroy.js
index 528909fe1..37b04cf83 100644
--- a/test/unit/query/test-streaming-destroy.js
+++ b/test/unit/query/test-streaming-destroy.js
@@ -14,6 +14,9 @@ server.listen(common.fakeServerPort, function (err) {
     count++;
     assert.equal(count, 1);
     connection.destroy();
-    server.destroy();
+
+    process.nextTick(function () {
+      server.destroy();
+    });
   });
 });

From 7c1d644bfdcb22f807bf7b4b6a60f0e4729950bf Mon Sep 17 00:00:00 2001
From: Douglas Christopher Wilson <doug@somethingdoug.com>
Date: Thu, 14 May 2015 15:39:15 -0400
Subject: [PATCH 3/4] Support io.js 2.0

---
 .travis.yml  | 1 +
 appveyor.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f4a966ec5..fa4c8dad8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ node_js:
   - '0.12'
   - '1.0'
   - '1.8'
+  - '2.0'
 
 sudo: false
 
diff --git a/appveyor.yml b/appveyor.yml
index 3ec397533..180e2e4cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,6 +11,7 @@ environment:
     - nodejs_version: "0.12"
     - nodejs_version: "1.0"
     - nodejs_version: "1.8"
+    - nodejs_version: "2.0"
 
 services:
   - mysql

From cd3e562f72582abf29106e3f42efa538170d7e33 Mon Sep 17 00:00:00 2001
From: Morton Fox <github@qslw.com>
Date: Tue, 26 May 2015 12:19:23 -0400
Subject: [PATCH 4/4] Update Holiday Extras hiring link

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index cba3b5564..59c835427 100644
--- a/Readme.md
+++ b/Readme.md
@@ -124,7 +124,7 @@ spend more time on it (ordered by time of contribution):
   video encoding as a service, check it out)
 * [Joyent](http://www.joyent.com/)
 * [pinkbike.com](http://pinkbike.com/)
-* [Holiday Extras](http://www.holidayextras.co.uk/) (they are [hiring](http://join.holidayextras.co.uk/vacancy/software-engineer/))
+* [Holiday Extras](http://www.holidayextras.co.uk/) (they are [hiring](http://join.holidayextras.co.uk/vacancy/software-engineer-5/))
 * [Newscope](http://newscope.com/) (they are [hiring](http://www.newscope.com/stellenangebote))
 
 If you are interested in sponsoring a day or more of my time, please