Branch 1.1

.arcconfig

@@ -1,13 +1,6 @@
 {
-  "project_id" : "hbase",
+  "project_id" : "HBaseOnGithub",
   "conduit_uri" : "https://reviews.facebook.net/",
   "copyright_holder" : "Apache Software Foundation",
-  "phutil_libraries" : {
-    "arclib" : ".arc_jira_lib"
-  },
-  "arcanist_configuration" : "ArcJIRAConfiguration",
-  "jira_project" : "HBASE",
-  "jira_api_url" : "https://issues.apache.org/jira/si/",
-  "lint_engine" : "JavaLintEngine",
   "max_line_length" : 100
 }

.gitignore

@@ -14,3 +14,5 @@ hbase-*/test
 *.iws
 *.iml
 *.ipr
+patchprocess/
+dependency-reduced-pom.xml

NOTICE.txt

@@ -1,20 +1,46 @@
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
+Apache HBase
+Copyright 2007-2015 The Apache Software Foundation
 
-In addition, this product includes software developed by:
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
-Jamon (http://www.jamon.org/) is a text template engine for Java used by our
-UI.  It uses the Mozilla Public License (http://www.mozilla.org/MPL/)
-See the tail of http://www.jamon.org/About.html
+--
+This product incorporates portions of the 'Hadoop' project
 
-JUnit (http://www.junit.org/) included under the Common Public License v1.0.  See
-the full text here: http://junit.sourceforge.net/cpl-v10.html
+Copyright 2007-2009 The Apache Software Foundation
 
-JRuby (http://jruby.org) is tri-licensed.  We include it under terms of the
-Common Public License v1.0.
+Licensed under the Apache License v2.0
+--
+Our Orca logo we got here: http://www.vectorfree.com/jumping-orca
+It is licensed Creative Commons Attribution 3.0.
+See https://creativecommons.org/licenses/by/3.0/us/
+We changed the logo by stripping the colored background, inverting
+it and then rotating it some.
 
-JRuby itself includes libraries variously licensed.  See its COPYING document
-for details: https://github.com/jruby/jruby/blob/master/COPYING
-
-The JRuby community went out of their way to make JRuby compatible with Apache
-projects: See https://issues.apache.org/jira/browse/HBASE-3374)
+Later we found that vectorfree.com image is not properly licensed.
+The original is owned by vectorportal.com. The original was
+relicensed so we could use it as Creative Commons Attribution 3.0.
+The license is bundled with the download available here:
+http://www.vectorportal.com/subcategory/205/KILLER-WHALE-FREE-VECTOR.eps/ifile/9136/detailtest.asp
+--
+This product includes portions of the Bootstrap project v3.0.0
+
+Copyright 2013 Twitter, Inc.
+
+Licensed under the Apache License v2.0
+
+This product uses the Glyphicons Halflings icon set.
+
+http://glyphicons.com/
+
+Copyright Jan Kovařík
+
+Licensed under the Apache License v2.0 as a part of the Bootstrap project.
+
+--
+This product includes portions of the Guava project v14, specifically
+'hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java'
+
+Copyright (C) 2007 The Guava Authors
+
+Licensed under the Apache License, Version 2.0

README.txt

@@ -24,11 +24,11 @@ The HBase distribution includes cryptographic software. See the export control
 notice here [9].
 
 1. http://hbase.apache.org
-2. http://labs.google.com/papers/bigtable.html
+2. http://research.google.com/archive/bigtable.html
 3. http://hadoop.apache.org
 4. http://www.apache.org/dyn/closer.cgi/hbase/
-5. http://hbase.apache.org/docs/current/source-repository.html
-6. http://hbase.apache.org/docs/current/issue-tracking.html
-7. http://hbase.apache.org/docs/current/license.html
-8. http://hbase.apache.org/docs/current/mail-lists.html
-9. http://hbase.apache.org/docs/current/export-notice.html
+5. https://hbase.apache.org/source-repository.html
+6. https://hbase.apache.org/issue-tracking.html
+7. http://hbase.apache.org/license.html
+8. http://hbase.apache.org/mail-lists.html
+9. https://hbase.apache.org/export_control.html

bin/graceful_stop.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 #
 #/**
-# * Copyright 2011 The Apache Software Foundation
-# *
 # * Licensed to the Apache Software Foundation (ASF) under one
 # * or more contributor license agreements.  See the NOTICE file
 # * distributed with this work for additional information
@@ -86,6 +84,13 @@ fi
 hostname=$1
 filename="/tmp/$hostname"
 
+local=
+localhostname=`/bin/hostname`
+
+if [ "$localhostname" == "$hostname" ]; then
+  local=true
+fi
+
 log "Disabling load balancer"
 HBASE_BALANCER_STATE=`echo 'balance_switch false' | "$bin"/hbase --config ${HBASE_CONF_DIR} shell | tail -3 | head -1`
 log "Previous balancer state was $HBASE_BALANCER_STATE"
@@ -98,27 +103,50 @@ log "Unloaded $hostname region(s)"
 hosts="/tmp/$(basename $0).$$.tmp"
 echo $hostname >> $hosts
 if [ "$thrift" != "" ]; then
-  log "Stopping thrift"
-  "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop thrift
+  log "Stopping thrift server on $hostname"
+  if [ "$local" == true ]; then
+    "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} stop thrift
+  else
+    "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop thrift
+  fi
 fi
 if [ "$rest" != "" ]; then
-  log "Stopping rest"
-  "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop rest
+  log "Stopping rest server on $hostname"
+  if [ "$local" == true ]; then
+    "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} stop rest
+  else
+    "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop rest
+  fi
+fi
+log "Stopping regionserver on $hostname"
+if [ "$local" == true ]; then
+  "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} stop regionserver
+else
+  "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop regionserver
 fi
-log "Stopping regionserver"
-"$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop regionserver
-
 if [ "$restart" != "" ]; then
-  log "Restarting regionserver"
-  "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start regionserver
+  log "Restarting regionserver on $hostname"
+  if [ "$local" == true ]; then
+    "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} start regionserver
+  else
+    "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start regionserver
+  fi
   if [ "$thrift" != "" ]; then
-    log "Restarting thrift"
+    log "Restarting thrift server on $hostname"
     # -b 0.0.0.0 says listen on all interfaces rather than just default.
-    "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start thrift -b 0.0.0.0
+    if [ "$local" == true ]; then
+      "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} start thrift -b 0.0.0.0
+    else
+      "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start thrift -b 0.0.0.0
+    fi
   fi
   if [ "$rest" != "" ]; then
-    log "Restarting rest"
-    "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start rest
+    log "Restarting rest server on $hostname"
+    if [ "$local" == true ]; then
+      "$bin"/hbase-daemon.sh --config ${HBASE_CONF_DIR} start rest
+    else
+      "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start rest
+    fi
   fi
   if [ "$reload" != "" ]; then
     log "Reloading $hostname region(s)"
@@ -129,8 +157,8 @@ fi
 
 # Restore balancer state
 if [ $HBASE_BALANCER_STATE != "false" ]; then
-  log "Restoring balancer state to " $HBASE_BALANCER_STATE
-  log "balance_switch $HBASE_BALANCER_STATE" | "$bin"/hbase --config ${HBASE_CONF_DIR} shell &> /dev/null
+  log "Restoring balancer state to $HBASE_BALANCER_STATE"
+  echo "balance_switch $HBASE_BALANCER_STATE" | "$bin"/hbase --config ${HBASE_CONF_DIR} shell &> /dev/null
 fi
 
 # Cleanup tmp files.