From 1da4f31738855c2d3d7d7e7bbc8ac7c242579c9b Mon Sep 17 00:00:00 2001
From: Shayan Pooya <shayan@liveve.org>
Date: Mon, 27 Oct 2014 21:03:02 -0400
Subject: [PATCH 1/2] cloud: use micro instances by default

---
 cloud/google/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud/google/setup.sh b/cloud/google/setup.sh
index d47f4038a..78da2e614 100755
--- a/cloud/google/setup.sh
+++ b/cloud/google/setup.sh
@@ -34,7 +34,7 @@ for i in $(seq $N_SLAVES)
 do
     NODES=$(echo $NODES "disconode"$i)
 done
-gcloud compute instances create $NODES --image discoimage --zone $ZONE
+gcloud compute instances create $NODES --image discoimage --machine-type f1-micro --zone $ZONE
 
 echo "Waiting for the cluster to boot up..."
 sleep 20

From 379bbfc8164e1b6fa2b15f0e7ba6d4a40983d1ba Mon Sep 17 00:00:00 2001
From: Shayan Pooya <shayan@liveve.org>
Date: Mon, 27 Oct 2014 19:45:30 -0400
Subject: [PATCH 2/2] Bump version to 0.5.4

---
 Makefile             | 4 ++--
 doc/releases.rst     | 9 +++++++++
 master/.version      | 2 +-
 pkg/debian/changelog | 6 ++++++
 pkg/rpm/disco.spec   | 6 +++++-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dc0cf6527..184948b83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-DISCO_VERSION = 0.5.3
-DISCO_RELEASE = 0.5.3
+DISCO_VERSION = 0.5.4
+DISCO_RELEASE = 0.5.4
 
 # standard make installation variables
 sysconfdir    = /etc
diff --git a/doc/releases.rst b/doc/releases.rst
index ce191e8fc..502fa8d4c 100644
--- a/doc/releases.rst
+++ b/doc/releases.rst
@@ -3,6 +3,15 @@
 Release notes
 =============
 
+Disco 0.5.4 (October 27, 2014)
+-----------------
+New features
+''''''''''''
+- A lot of new examples including ipython, page rank, and travelling salesman problem.
+- Add a deployment script to get a cluster ready in Google Cloud in a couple of minutes.
+- Fixes to let Disco run on OSX Yosemite.
+- And a lot of bug fixes and performance improvements
+
 Disco 0.5.3 (August 5, 2014)
 -----------------
 New features
diff --git a/master/.version b/master/.version
index be14282b7..7d8568351 100644
--- a/master/.version
+++ b/master/.version
@@ -1 +1 @@
-0.5.3
+0.5.4
diff --git a/pkg/debian/changelog b/pkg/debian/changelog
index 5da634397..f710e8251 100644
--- a/pkg/debian/changelog
+++ b/pkg/debian/changelog
@@ -1,3 +1,9 @@
+disco (0.5.4) unstable; urgency=low
+
+  * New package for 0.5.4
+
+ -- Shayan Pooya <shayan@liveve.org>  Wed, 27 Oct 2014 22:00:00 -0700
+
 disco (0.5.3) unstable; urgency=low
 
   * New package for 0.5.3
diff --git a/pkg/rpm/disco.spec b/pkg/rpm/disco.spec
index d6299899c..defac6656 100644
--- a/pkg/rpm/disco.spec
+++ b/pkg/rpm/disco.spec
@@ -2,7 +2,7 @@
 %define _unpackaged_files_terminate_build 0
 Summary:  An open-source mapreduce framework.
 Name: disco
-Version: 0.5.3
+Version: 0.5.4
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemon
@@ -127,6 +127,10 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+
+* Fri Aug 01 2014 Shayan Pooya <shayan@liveve.org> - 0.5.4-1
+- Release version 0.5.4
+
 * Fri Aug 01 2014 Shayan Pooya <shayan@liveve.org> - 0.5.3-1
 - Release version 0.5.3