From d3f7947323b50ac1d1d5d74c8e765b94ad29af16 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 3 Jun 2009 05:11:48 +0000
Subject: [PATCH] HBASE-1478 Remove hbase master options from shell

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@781263 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt |  1 +
 bin/hirb.rb | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index faf3909111e..fe5c51b2efe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -303,6 +303,7 @@ Release 0.20.0 - Unreleased
    HBASE-1474  Add zk attributes to list of attributes 
                in master and regionserver UIs
    HBASE-1448  Add a node in ZK to tell all masters to shutdown
+   HBASE-1478  Remove hbase master options from shell (Nitay Joffe via Stack)
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue
diff --git a/bin/hirb.rb b/bin/hirb.rb
index c6aa085237d..cad62cafcf6 100644
--- a/bin/hirb.rb
+++ b/bin/hirb.rb
@@ -31,17 +31,12 @@ cmdline_help = <<HERE # HERE document output as shell usage
 HBase Shell command-line options:
  format        Formatter for outputting results: console | html. Default: console
  format-width  Width of table outputs. Default: 110 characters.
- master        HBase master shell should connect to: e.g --master=example:60000
 HERE
-master = nil
 found = []
 format = 'console'
 format_width = 110
 for arg in ARGV
-  if arg =~ /^--master=(.+)/i
-    master = $1
-    found.push(arg)
-  elsif arg =~ /^--format=(.+)/i
+  if arg =~ /^--format=(.+)/i
     format = $1
     if format =~ /^html$/i
       raise NoMethodError.new("Not yet implemented")
@@ -70,10 +65,9 @@ end
 @formatter = Formatter::Console.new(STDOUT, format_width)
 # TODO, etc.  @formatter = Formatter::XHTML.new(STDOUT)
 
-# Setup the HBase module.  Create a configuration.  If a master, set it.
+# Setup the HBase module.  Create a configuration.
 # Turn off retries in hbase and ipc.  Human doesn't want to wait on N retries.
 @configuration = org.apache.hadoop.hbase.HBaseConfiguration.new()
-@configuration.set("hbase.master", master) if master
 @configuration.setInt("hbase.client.retries.number", 5)
 @configuration.setInt("ipc.client.connect.max.retries", 3)