From b9d6604a94deaf8937f812ace4678ec0fa9a9647 Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Thu, 31 Dec 2009 17:36:46 +0000
Subject: [PATCH] HBASE-2083 [EC2] HDFS DataNode no longer required on master

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@894903 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                  | 6 ++++--
 src/contrib/ec2/bin/hbase-ec2-init-remote.sh | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1a82c9bd0c3..778e76413a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -148,7 +148,6 @@ Release 0.21.0 - Unreleased
                (Lars George via JD)
    HBASE-2082  TableInputFormat is ignoring input scan's stop row setting
                (Scott Wang via Andrew Purtell)
-   HBASE-2080  [EC2] Support multivolume local instance storage
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
@@ -265,13 +264,16 @@ Release 0.21.0 - Unreleased
                times
    HBASE-2062  Metrics documentation outdated (Lars George via JD)
    HBASE-2045  Update trunk and branch zk to just-release 3.2.2.
-   HBASE-2074  Improvements to the hadoop-config script (Bassam Tabbara via Stack)
+   HBASE-2074  Improvements to the hadoop-config script (Bassam Tabbara via
+               Stack)
    HBASE-2076  Many javadoc warnings
    HBASE-2068  MetricsRate is missing "registry" parameter (Lars George via JD)
    HBASE-2025  0.20.2 accessed from older client throws 
                UndeclaredThrowableException; frustrates rolling upgrade
    HBASE-2081  Set the retries higher in shell since client pause is lower
    HBASE-1956  Export HDFS read and write latency as a metric
+   HBASE-2080  [EC2] Support multivolume local instance storage
+   HBASE-2083  [EC2] HDFS DataNode no longer required on master
 
   NEW FEATURES
    HBASE-1901  "General" partitioner for "hbase-48" bulk (behind the api, write
diff --git a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
index d10c2a9ff69..63407284fa4 100644
--- a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
+++ b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
@@ -223,7 +223,6 @@ if [ "$IS_MASTER" = "true" ]; then
   # only format on first boot
   [ ! -e /mnt/hadoop/dfs/name ] && "$HADOOP_HOME"/bin/hadoop namenode -format
   "$HADOOP_HOME"/bin/hadoop-daemon.sh start namenode
-  "$HADOOP_HOME"/bin/hadoop-daemon.sh start datanode
   "$HADOOP_HOME"/bin/hadoop-daemon.sh start jobtracker
   "$HBASE_HOME"/bin/hbase-daemon.sh start master
 else