hbase git commit: HBASE-14354 Minor improvements for usage of the mlock agent

2015-09-01 Thread apurtell
Repository: hbase
Updated Branches:
  refs/heads/0.98 437b58f3d -> 88e772fcc


HBASE-14354 Minor improvements for usage of the mlock agent


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/88e772fc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/88e772fc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/88e772fc

Branch: refs/heads/0.98
Commit: 88e772fcce0a46197c8f63cfa3d2b8c25e1668f5
Parents: 437b58f
Author: Esteban Gutierrez 
Authored: Tue Sep 1 18:36:39 2015 -0700
Committer: Andrew Purtell 
Committed: Tue Sep 1 19:41:35 2015 -0700

--
 bin/hbase-config.sh | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/88e772fc/bin/hbase-config.sh
--
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index d2f05a2..fb75169 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f 
"${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
 cat 1>&2 <

hbase git commit: HBASE-14354 Minor improvements for usage of the mlock agent

2015-09-01 Thread esteban
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 af7e34f99 -> 7c287597a


HBASE-14354 Minor improvements for usage of the mlock agent


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7c287597
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7c287597
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7c287597

Branch: refs/heads/branch-1.2
Commit: 7c287597accefc1dea13af9760735b87fa3aeb3e
Parents: af7e34f
Author: Esteban Gutierrez 
Authored: Tue Sep 1 18:36:39 2015 -0700
Committer: Esteban Gutierrez 
Committed: Tue Sep 1 18:45:18 2015 -0700

--
 bin/hbase-config.sh | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7c287597/bin/hbase-config.sh
--
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5c518b1..c113adb 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f 
"${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
 cat 1>&2 <

hbase git commit: HBASE-14354 Minor improvements for usage of the mlock agent

2015-09-01 Thread esteban
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 026330588 -> f0891a6a0


HBASE-14354 Minor improvements for usage of the mlock agent


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f0891a6a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f0891a6a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f0891a6a

Branch: refs/heads/branch-1.1
Commit: f0891a6a0c49ea0b3c3c394753dadef5617fedaa
Parents: 0263305
Author: Esteban Gutierrez 
Authored: Tue Sep 1 18:36:39 2015 -0700
Committer: Esteban Gutierrez 
Committed: Tue Sep 1 18:44:45 2015 -0700

--
 bin/hbase-config.sh | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f0891a6a/bin/hbase-config.sh
--
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5c518b1..c113adb 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f 
"${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
 cat 1>&2 <

hbase git commit: HBASE-14354 Minor improvements for usage of the mlock agent

2015-09-01 Thread esteban
Repository: hbase
Updated Branches:
  refs/heads/branch-1 a31adde0b -> 1b5fb8193


HBASE-14354 Minor improvements for usage of the mlock agent


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b5fb819
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b5fb819
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b5fb819

Branch: refs/heads/branch-1
Commit: 1b5fb8193e0b0ffb817658fff182b84ff6e84be8
Parents: a31adde
Author: Esteban Gutierrez 
Authored: Tue Sep 1 18:36:39 2015 -0700
Committer: Esteban Gutierrez 
Committed: Tue Sep 1 18:38:32 2015 -0700

--
 bin/hbase-config.sh | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1b5fb819/bin/hbase-config.sh
--
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5c518b1..c113adb 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f 
"${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
 cat 1>&2 <

hbase git commit: HBASE-14354 Minor improvements for usage of the mlock agent

2015-09-01 Thread esteban
Repository: hbase
Updated Branches:
  refs/heads/master 5bb36f159 -> f8dd99d73


HBASE-14354 Minor improvements for usage of the mlock agent


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f8dd99d7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f8dd99d7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f8dd99d7

Branch: refs/heads/master
Commit: f8dd99d7380e5eafae62a9f0c526ba24f98eb2e5
Parents: 5bb36f1
Author: Esteban Gutierrez 
Authored: Tue Sep 1 18:36:39 2015 -0700
Committer: Esteban Gutierrez 
Committed: Tue Sep 1 18:37:34 2015 -0700

--
 bin/hbase-config.sh | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8dd99d7/bin/hbase-config.sh
--
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5c518b1..c113adb 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -98,22 +98,20 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f 
"${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
-# Set default value for regionserver uid if not present
-if [ -z "$HBASE_REGIONSERVER_UID" ]; then
-  HBASE_REGIONSERVER_UID="hbase"
-fi
-
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
-  MLOCK_AGENT="$HBASE_HOME/native/libmlockall_agent.so"
+  MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
   if [ ! -f "$MLOCK_AGENT" ]; then
 cat 1>&2 <

[2/2] hbase git commit: HBASE-14253 update docs + build for maven 3.0.4+

2015-09-01 Thread busbey
HBASE-14253 update docs + build for maven 3.0.4+

Signed-off-by: Sean Busbey 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5bb36f15
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5bb36f15
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5bb36f15

Branch: refs/heads/master
Commit: 5bb36f1594f7bc70d245ffa475e1393964c496b0
Parents: e54cb8a
Author: Lars Francke 
Authored: Tue Sep 1 16:04:44 2015 -0500
Committer: Sean Busbey 
Committed: Tue Sep 1 16:17:31 2015 -0500

--
 pom.xml| 2 +-
 src/main/asciidoc/_chapters/developer.adoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5bb36f15/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e2a84c8..7041fd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1207,7 +1207,7 @@
 ${maven.build.timestamp}
 1.7
 
-3.0.3
+3.0.4
 ${compileSource}
 
 2.7.1

http://git-wip-us.apache.org/repos/asf/hbase/blob/5bb36f15/src/main/asciidoc/_chapters/developer.adoc
--
diff --git a/src/main/asciidoc/_chapters/developer.adoc 
b/src/main/asciidoc/_chapters/developer.adoc
index 409efbd..f96d87e 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -237,7 +237,7 @@ If you would like to assist, please have a look at 
link:https://issues.apache.or
 === Basic Compile
 
 HBase is compiled using Maven.
-You must use Maven 3.x.
+You must use at least Maven 3.0.4.
 To check your Maven version, run the command +mvn -version+.
 
 .JDK Version Requirements



[1/2] hbase git commit: HBASE-13221 List Hadoop 2.6 as unsupported due to HADOOP-11710.

2015-09-01 Thread busbey
Repository: hbase
Updated Branches:
  refs/heads/master f792ede46 -> 5bb36f159


HBASE-13221 List Hadoop 2.6 as unsupported due to HADOOP-11710.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e54cb8ab
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e54cb8ab
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e54cb8ab

Branch: refs/heads/master
Commit: e54cb8abebb2971da68852c6dcef456dbc689afb
Parents: f792ede
Author: Sean Busbey 
Authored: Mon Aug 31 23:03:53 2015 -0500
Committer: Sean Busbey 
Committed: Tue Sep 1 16:17:30 2015 -0500

--
 src/main/asciidoc/_chapters/configuration.adoc | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e54cb8ab/src/main/asciidoc/_chapters/configuration.adoc
--
diff --git a/src/main/asciidoc/_chapters/configuration.adoc 
b/src/main/asciidoc/_chapters/configuration.adoc
index 0e5f031..5a4a6ec 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -222,11 +222,20 @@ Use the following legend to interpret this table:
 |Hadoop-2.3.x | NT | S | NT | NT | NT
 |Hadoop-2.4.x | NT | S | S | S | S
 |Hadoop-2.5.x | NT | S | S | S | S
-|Hadoop-2.6.x | NT | NT | S | S | S
+|Hadoop-2.6.x | X | X | X | X | X
 |Hadoop-2.7.0 | X | X | X | X | X
 |Hadoop-2.7.1+ | NT | NT | NT | NT | S
 |===
 
+.Hadoop 2.6.x
+[TIP]
+
+Hadoop distributions based on the 2.6.x line *must* have
+link:https://issues.apache.org/jira/browse/HADOOP-11710[HADOOP-11710] applied 
if you plan to run
+HBase on top of an HDFS Encryption Zone. Failure to do so will result in 
cluster failure and
+data loss.
+
+
 .Hadoop 2.7.x
 [TIP]
 



Git Push Summary

2015-09-01 Thread apurtell
Repository: hbase
Updated Tags:  refs/tags/0.98.14 [created] bcabd3b89


hbase git commit: HBASE-14332 Show the table state when we encounter exception while disabling / enabling table (Nick Han)

2015-09-01 Thread tedyu
Repository: hbase
Updated Branches:
  refs/heads/master 4f410e6bd -> f792ede46


HBASE-14332 Show the table state when we encounter exception while disabling / 
enabling table (Nick Han)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f792ede4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f792ede4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f792ede4

Branch: refs/heads/master
Commit: f792ede466eddfbcdd67b8490296bf7712f39119
Parents: 4f410e6
Author: tedyu 
Authored: Tue Sep 1 13:00:28 2015 -0700
Committer: tedyu 
Committed: Tue Sep 1 13:00:28 2015 -0700

--
 .../apache/hadoop/hbase/master/TableStateManager.java   |  7 ---
 .../hbase/master/handler/DisableTableHandler.java   | 12 +++-
 .../hadoop/hbase/master/handler/EnableTableHandler.java | 12 +++-
 .../hbase/master/procedure/DisableTableProcedure.java   |  8 +---
 .../hbase/master/procedure/EnableTableProcedure.java|  8 +---
 5 files changed, 28 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f792ede4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
index c9daa0d..12db91e 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
@@ -77,9 +77,10 @@ public class TableStateManager {
* @param tableName table to change state for
* @param newState new state
* @param states states to check against
+   * @return null if succeed or table state if failed
* @throws IOException
*/
-  public boolean setTableStateIfInStates(TableName tableName,
+  public TableState.State setTableStateIfInStates(TableName tableName,
  TableState.State newState,
  TableState.State... states)
   throws IOException {
@@ -91,9 +92,9 @@ public class TableStateManager {
   }
   if (currentState.inStates(states)) {
 udpateMetaState(tableName, newState);
-return true;
+return null;
   } else {
-return false;
+return currentState.getState();
   }
 } finally {
   lock.writeLock().unlock();

http://git-wip-us.apache.org/repos/asf/hbase/blob/f792ede4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
index ee77419..d34f25e 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
@@ -90,11 +90,13 @@ public class DisableTableHandler extends EventHandler {
   // DISABLED or ENABLED.
   //TODO: reevaluate this since we have table locks now
   if (!skipTableStateCheck) {
-if 
(!this.assignmentManager.getTableStateManager().setTableStateIfInStates(
-  this.tableName, TableState.State.DISABLING,
-  TableState.State.ENABLED)) {
-  LOG.info("Table " + tableName + " isn't enabled; skipping disable");
-  throw new TableNotEnabledException(this.tableName);
+TableState.State state = this.assignmentManager.
+getTableStateManager().setTableStateIfInStates(
+this.tableName, TableState.State.DISABLING,
+TableState.State.ENABLED);
+if (state!=null) {
+  LOG.info("Table " + tableName + " isn't enabled;is "+state.name()+"; 
skipping disable");
+  throw new TableNotEnabledException(this.tableName+" state is 
"+state.name());
 }
   }
   success = true;

http://git-wip-us.apache.org/repos/asf/hbase/blob/f792ede4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
index c7145fd..fd3d4c7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler

hbase git commit: HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars Francke)

2015-09-01 Thread tedyu
Repository: hbase
Updated Branches:
  refs/heads/branch-1 58b3cfec0 -> a31adde0b


HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars 
Francke)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a31adde0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a31adde0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a31adde0

Branch: refs/heads/branch-1
Commit: a31adde0bd85347360037bb5847a6018c556d9ca
Parents: 58b3cfe
Author: tedyu 
Authored: Tue Sep 1 11:12:29 2015 -0700
Committer: tedyu 
Committed: Tue Sep 1 11:12:29 2015 -0700

--
 .../hadoop/hbase/regionserver/RegionMergeTransactionImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a31adde0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
index 774c167..514d2d5 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
@@ -824,7 +824,7 @@ public class RegionMergeTransactionImpl implements 
RegionMergeTransaction {
 
   @Override
   public List getJournal() {
-return getJournal();
+return journal;
   }
 
   @Override



hbase git commit: HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars Francke)

2015-09-01 Thread tedyu
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 af6738978 -> 026330588


HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars 
Francke)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/02633058
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/02633058
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/02633058

Branch: refs/heads/branch-1.1
Commit: 0263305880d5473b1b5024a127257c248256d53d
Parents: af67389
Author: tedyu 
Authored: Tue Sep 1 11:12:04 2015 -0700
Committer: tedyu 
Committed: Tue Sep 1 11:12:04 2015 -0700

--
 .../hadoop/hbase/regionserver/RegionMergeTransactionImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/02633058/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
index 774c167..514d2d5 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
@@ -824,7 +824,7 @@ public class RegionMergeTransactionImpl implements 
RegionMergeTransaction {
 
   @Override
   public List getJournal() {
-return getJournal();
+return journal;
   }
 
   @Override



hbase git commit: HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local repository

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 a0ec34814 -> e19cb719d


HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local 
repository


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e19cb719
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e19cb719
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e19cb719

Branch: refs/heads/branch-1.0
Commit: e19cb719df01ac5be256df41f32804bb6b88ce6e
Parents: a0ec348
Author: Nick Dimiduk 
Authored: Thu Aug 27 11:08:17 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:29:18 2015 -0700

--
 dev-support/make_rc.sh | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e19cb719/dev-support/make_rc.sh
--
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 4892252..50e8efd 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that assembles all you need to make an RC.
-# Does build of the tar.gzs which it stashes into a dir above $HBASE_HOME
-# named for the script with a timestamp suffix.
-# Deploys builds to maven.
+# Script that assembles all you need to make an RC. Does build of the tar.gzs
+# which it stashes into a dir above $(pwd) named for the script with a
+# timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
 # close the maven repos.  Call a vote. 
@@ -31,7 +30,6 @@ set -e
 
 devsupport=`dirname "$0"`
 devsupport=`cd "$devsupport">/dev/null; pwd`
-HBASE_HOME=`cd ${devsupport}/.. > /dev/null; pwd`
 
 # Set mvn and mvnopts
 mvn=mvn
@@ -45,33 +43,41 @@ fi
 
 # Make a dir to save tgzs in.
 d=`date -u +"%Y%m%dT%H%M%SZ"`
-archivedir="${HBASE_HOME}/../`basename $0`.$d"
+archivedir="$(pwd)/../`basename $0`.$d"
 echo "Archive dir ${archivedir}"
-mkdir -p "${archivedir}" 
+mkdir -p "${archivedir}"
 
 function tgz_mover {
-  mv "${HBASE_HOME}"/hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
+  mv ./hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
 }
 
 function deploy {
-  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
-  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease \
+-Dmaven.repo.local=${archivedir}/repository
+  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease \
+-Dmaven.repo.local=${archivedir}/repository
   tgz_mover
-  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release 
+  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease 
\
+-Dmaven.repo.local=${archivedir}/repository
 }
 
 # Build src tarball
-MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests assembly:single 
-Dassembly.file="${HBASE_HOME}/hbase-assembly/src/main/assembly/src.xml" 
-Prelease
+# run clean separate from assembly:single because it fails to clean shaded 
modules correctly
+MAVEN_OPTS="${mvnopts}" ${mvn} clean
+MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
+  -Dassembly.file="$(pwd)/hbase-assembly/src/main/assembly/src.xml" \
+  -Prelease -Dmaven.repo.local=${archivedir}/repository
+
 tgz_mover
 
 # Now do the two builds,  one for hadoop1, then hadoop2
 deploy
 
 echo "DONE"
-echo "Check the content of ${archivedir}.  If good, sign and push to 
people.apache.org"
+echo "Check the content of ${archivedir}.  If good, sign and push to 
dist.apache.org"
 echo " cd ${archivedir}"
 echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
 echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig 
$i  ; done'
-echo ' rsync -av ${archivedir} people.apache.org:public_html/hbase-VERSION'
+echo ' rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc 
~/repos/dist-dev/hbase-VERSION/'
 echo "Check the content deployed to maven.  If good, close the repo and record 
links of temporary staging repo"
 echo "If all good tag the RC"



hbase git commit: HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local repository

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 2f2ee2522 -> af6738978


HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local 
repository


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/af673897
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/af673897
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/af673897

Branch: refs/heads/branch-1.1
Commit: af673897801790aa5908b1e7462385f1f5d66c03
Parents: 2f2ee25
Author: Nick Dimiduk 
Authored: Thu Aug 27 11:08:17 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:29:06 2015 -0700

--
 dev-support/make_rc.sh | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/af673897/dev-support/make_rc.sh
--
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 0d0319b..50e8efd 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that assembles all you need to make an RC.
-# Does build of the tar.gzs which it stashes into a dir above $HBASE_HOME
-# named for the script with a timestamp suffix.
-# Deploys builds to maven.
+# Script that assembles all you need to make an RC. Does build of the tar.gzs
+# which it stashes into a dir above $(pwd) named for the script with a
+# timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
 # close the maven repos.  Call a vote. 
@@ -31,7 +30,6 @@ set -e
 
 devsupport=`dirname "$0"`
 devsupport=`cd "$devsupport">/dev/null; pwd`
-HBASE_HOME=`cd ${devsupport}/.. > /dev/null; pwd`
 
 # Set mvn and mvnopts
 mvn=mvn
@@ -45,33 +43,41 @@ fi
 
 # Make a dir to save tgzs in.
 d=`date -u +"%Y%m%dT%H%M%SZ"`
-archivedir="${HBASE_HOME}/../`basename $0`.$d"
+archivedir="$(pwd)/../`basename $0`.$d"
 echo "Archive dir ${archivedir}"
-mkdir -p "${archivedir}" 
+mkdir -p "${archivedir}"
 
 function tgz_mover {
-  mv "${HBASE_HOME}"/hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
+  mv ./hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
 }
 
 function deploy {
-  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
-  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease \
+-Dmaven.repo.local=${archivedir}/repository
+  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease \
+-Dmaven.repo.local=${archivedir}/repository
   tgz_mover
-  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease 
\
+-Dmaven.repo.local=${archivedir}/repository
 }
 
 # Build src tarball
-MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests assembly:single 
-Dassembly.file="${HBASE_HOME}/hbase-assembly/src/main/assembly/src.xml" 
-Prelease
+# run clean separate from assembly:single because it fails to clean shaded 
modules correctly
+MAVEN_OPTS="${mvnopts}" ${mvn} clean
+MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
+  -Dassembly.file="$(pwd)/hbase-assembly/src/main/assembly/src.xml" \
+  -Prelease -Dmaven.repo.local=${archivedir}/repository
+
 tgz_mover
 
 # Now do the two builds,  one for hadoop1, then hadoop2
 deploy
 
 echo "DONE"
-echo "Check the content of ${archivedir}.  If good, sign and push to 
people.apache.org"
+echo "Check the content of ${archivedir}.  If good, sign and push to 
dist.apache.org"
 echo " cd ${archivedir}"
 echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
 echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig 
$i  ; done'
-echo ' rsync -av ${archivedir} people.apache.org:public_html/hbase-VERSION'
+echo ' rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc 
~/repos/dist-dev/hbase-VERSION/'
 echo "Check the content deployed to maven.  If good, close the repo and record 
links of temporary staging repo"
 echo "If all good tag the RC"



hbase git commit: HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local repository

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 c331685c9 -> af7e34f99


HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local 
repository


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/af7e34f9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/af7e34f9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/af7e34f9

Branch: refs/heads/branch-1.2
Commit: af7e34f99583569ee374cbf8830598f76f79b3ad
Parents: c331685
Author: Nick Dimiduk 
Authored: Thu Aug 27 11:08:17 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:28:52 2015 -0700

--
 dev-support/make_rc.sh | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/af7e34f9/dev-support/make_rc.sh
--
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 0d0319b..50e8efd 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that assembles all you need to make an RC.
-# Does build of the tar.gzs which it stashes into a dir above $HBASE_HOME
-# named for the script with a timestamp suffix.
-# Deploys builds to maven.
+# Script that assembles all you need to make an RC. Does build of the tar.gzs
+# which it stashes into a dir above $(pwd) named for the script with a
+# timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
 # close the maven repos.  Call a vote. 
@@ -31,7 +30,6 @@ set -e
 
 devsupport=`dirname "$0"`
 devsupport=`cd "$devsupport">/dev/null; pwd`
-HBASE_HOME=`cd ${devsupport}/.. > /dev/null; pwd`
 
 # Set mvn and mvnopts
 mvn=mvn
@@ -45,33 +43,41 @@ fi
 
 # Make a dir to save tgzs in.
 d=`date -u +"%Y%m%dT%H%M%SZ"`
-archivedir="${HBASE_HOME}/../`basename $0`.$d"
+archivedir="$(pwd)/../`basename $0`.$d"
 echo "Archive dir ${archivedir}"
-mkdir -p "${archivedir}" 
+mkdir -p "${archivedir}"
 
 function tgz_mover {
-  mv "${HBASE_HOME}"/hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
+  mv ./hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
 }
 
 function deploy {
-  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
-  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease \
+-Dmaven.repo.local=${archivedir}/repository
+  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease \
+-Dmaven.repo.local=${archivedir}/repository
   tgz_mover
-  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease 
\
+-Dmaven.repo.local=${archivedir}/repository
 }
 
 # Build src tarball
-MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests assembly:single 
-Dassembly.file="${HBASE_HOME}/hbase-assembly/src/main/assembly/src.xml" 
-Prelease
+# run clean separate from assembly:single because it fails to clean shaded 
modules correctly
+MAVEN_OPTS="${mvnopts}" ${mvn} clean
+MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
+  -Dassembly.file="$(pwd)/hbase-assembly/src/main/assembly/src.xml" \
+  -Prelease -Dmaven.repo.local=${archivedir}/repository
+
 tgz_mover
 
 # Now do the two builds,  one for hadoop1, then hadoop2
 deploy
 
 echo "DONE"
-echo "Check the content of ${archivedir}.  If good, sign and push to 
people.apache.org"
+echo "Check the content of ${archivedir}.  If good, sign and push to 
dist.apache.org"
 echo " cd ${archivedir}"
 echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
 echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig 
$i  ; done'
-echo ' rsync -av ${archivedir} people.apache.org:public_html/hbase-VERSION'
+echo ' rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc 
~/repos/dist-dev/hbase-VERSION/'
 echo "Check the content deployed to maven.  If good, close the repo and record 
links of temporary staging repo"
 echo "If all good tag the RC"



hbase git commit: HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local repository

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/branch-1 f30d3dc20 -> 58b3cfec0


HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local 
repository


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/58b3cfec
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/58b3cfec
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/58b3cfec

Branch: refs/heads/branch-1
Commit: 58b3cfec0e4461334d5c5ebf1184fd05cd3cd810
Parents: f30d3dc
Author: Nick Dimiduk 
Authored: Thu Aug 27 11:08:17 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:28:32 2015 -0700

--
 dev-support/make_rc.sh | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/58b3cfec/dev-support/make_rc.sh
--
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 0d0319b..50e8efd 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that assembles all you need to make an RC.
-# Does build of the tar.gzs which it stashes into a dir above $HBASE_HOME
-# named for the script with a timestamp suffix.
-# Deploys builds to maven.
+# Script that assembles all you need to make an RC. Does build of the tar.gzs
+# which it stashes into a dir above $(pwd) named for the script with a
+# timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
 # close the maven repos.  Call a vote. 
@@ -31,7 +30,6 @@ set -e
 
 devsupport=`dirname "$0"`
 devsupport=`cd "$devsupport">/dev/null; pwd`
-HBASE_HOME=`cd ${devsupport}/.. > /dev/null; pwd`
 
 # Set mvn and mvnopts
 mvn=mvn
@@ -45,33 +43,41 @@ fi
 
 # Make a dir to save tgzs in.
 d=`date -u +"%Y%m%dT%H%M%SZ"`
-archivedir="${HBASE_HOME}/../`basename $0`.$d"
+archivedir="$(pwd)/../`basename $0`.$d"
 echo "Archive dir ${archivedir}"
-mkdir -p "${archivedir}" 
+mkdir -p "${archivedir}"
 
 function tgz_mover {
-  mv "${HBASE_HOME}"/hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
+  mv ./hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
 }
 
 function deploy {
-  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
-  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease \
+-Dmaven.repo.local=${archivedir}/repository
+  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease \
+-Dmaven.repo.local=${archivedir}/repository
   tgz_mover
-  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease 
\
+-Dmaven.repo.local=${archivedir}/repository
 }
 
 # Build src tarball
-MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests assembly:single 
-Dassembly.file="${HBASE_HOME}/hbase-assembly/src/main/assembly/src.xml" 
-Prelease
+# run clean separate from assembly:single because it fails to clean shaded 
modules correctly
+MAVEN_OPTS="${mvnopts}" ${mvn} clean
+MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
+  -Dassembly.file="$(pwd)/hbase-assembly/src/main/assembly/src.xml" \
+  -Prelease -Dmaven.repo.local=${archivedir}/repository
+
 tgz_mover
 
 # Now do the two builds,  one for hadoop1, then hadoop2
 deploy
 
 echo "DONE"
-echo "Check the content of ${archivedir}.  If good, sign and push to 
people.apache.org"
+echo "Check the content of ${archivedir}.  If good, sign and push to 
dist.apache.org"
 echo " cd ${archivedir}"
 echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
 echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig 
$i  ; done'
-echo ' rsync -av ${archivedir} people.apache.org:public_html/hbase-VERSION'
+echo ' rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc 
~/repos/dist-dev/hbase-VERSION/'
 echo "Check the content deployed to maven.  If good, close the repo and record 
links of temporary staging repo"
 echo "If all good tag the RC"



hbase git commit: HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local repository

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/master 498c1845a -> 4f410e6bd


HBASE-14318 make_rc.sh should purge/re-resolve dependencies from local 
repository


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4f410e6b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4f410e6b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4f410e6b

Branch: refs/heads/master
Commit: 4f410e6bd5406eacbfae98d21786dfc24cb57f1b
Parents: 498c184
Author: Nick Dimiduk 
Authored: Thu Aug 27 11:08:17 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:28:08 2015 -0700

--
 dev-support/make_rc.sh | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4f410e6b/dev-support/make_rc.sh
--
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 0d0319b..50e8efd 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that assembles all you need to make an RC.
-# Does build of the tar.gzs which it stashes into a dir above $HBASE_HOME
-# named for the script with a timestamp suffix.
-# Deploys builds to maven.
+# Script that assembles all you need to make an RC. Does build of the tar.gzs
+# which it stashes into a dir above $(pwd) named for the script with a
+# timestamp suffix. Deploys builds to maven.
 #
 # To finish, check what was build.  If good copy to people.apache.org and
 # close the maven repos.  Call a vote. 
@@ -31,7 +30,6 @@ set -e
 
 devsupport=`dirname "$0"`
 devsupport=`cd "$devsupport">/dev/null; pwd`
-HBASE_HOME=`cd ${devsupport}/.. > /dev/null; pwd`
 
 # Set mvn and mvnopts
 mvn=mvn
@@ -45,33 +43,41 @@ fi
 
 # Make a dir to save tgzs in.
 d=`date -u +"%Y%m%dT%H%M%SZ"`
-archivedir="${HBASE_HOME}/../`basename $0`.$d"
+archivedir="$(pwd)/../`basename $0`.$d"
 echo "Archive dir ${archivedir}"
-mkdir -p "${archivedir}" 
+mkdir -p "${archivedir}"
 
 function tgz_mover {
-  mv "${HBASE_HOME}"/hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
+  mv ./hbase-assembly/target/hbase-*.tar.gz "${archivedir}"
 }
 
 function deploy {
-  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
-  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease \
+-Dmaven.repo.local=${archivedir}/repository
+  MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single 
-Prelease \
+-Dmaven.repo.local=${archivedir}/repository
   tgz_mover
-  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease
+  MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease 
\
+-Dmaven.repo.local=${archivedir}/repository
 }
 
 # Build src tarball
-MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests assembly:single 
-Dassembly.file="${HBASE_HOME}/hbase-assembly/src/main/assembly/src.xml" 
-Prelease
+# run clean separate from assembly:single because it fails to clean shaded 
modules correctly
+MAVEN_OPTS="${mvnopts}" ${mvn} clean
+MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
+  -Dassembly.file="$(pwd)/hbase-assembly/src/main/assembly/src.xml" \
+  -Prelease -Dmaven.repo.local=${archivedir}/repository
+
 tgz_mover
 
 # Now do the two builds,  one for hadoop1, then hadoop2
 deploy
 
 echo "DONE"
-echo "Check the content of ${archivedir}.  If good, sign and push to 
people.apache.org"
+echo "Check the content of ${archivedir}.  If good, sign and push to 
dist.apache.org"
 echo " cd ${archivedir}"
 echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
 echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig 
$i  ; done'
-echo ' rsync -av ${archivedir} people.apache.org:public_html/hbase-VERSION'
+echo ' rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc 
~/repos/dist-dev/hbase-VERSION/'
 echo "Check the content deployed to maven.  If good, close the repo and record 
links of temporary staging repo"
 echo "If all good tag the RC"



hbase git commit: bump version to 1.1.3-SNAPSHOT

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 12f4c1ace -> 2f2ee2522


bump version to 1.1.3-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2f2ee252
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2f2ee252
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2f2ee252

Branch: refs/heads/branch-1.1
Commit: 2f2ee252233c2a80e5e6b886c9f30086400c3e04
Parents: 12f4c1a
Author: Nick Dimiduk 
Authored: Tue Sep 1 10:17:33 2015 -0700
Committer: Nick Dimiduk 
Committed: Tue Sep 1 10:17:33 2015 -0700

--
 hbase-annotations/pom.xml| 2 +-
 hbase-assembly/pom.xml   | 2 +-
 hbase-checkstyle/pom.xml | 4 ++--
 hbase-client/pom.xml | 2 +-
 hbase-common/pom.xml | 2 +-
 hbase-examples/pom.xml   | 2 +-
 hbase-hadoop-compat/pom.xml  | 2 +-
 hbase-hadoop2-compat/pom.xml | 2 +-
 hbase-it/pom.xml | 2 +-
 hbase-prefix-tree/pom.xml| 2 +-
 hbase-procedure/pom.xml  | 2 +-
 hbase-protocol/pom.xml   | 2 +-
 hbase-resource-bundle/pom.xml| 2 +-
 hbase-rest/pom.xml   | 2 +-
 hbase-server/pom.xml | 2 +-
 hbase-shaded/hbase-shaded-client/pom.xml | 2 +-
 hbase-shaded/hbase-shaded-server/pom.xml | 2 +-
 hbase-shaded/pom.xml | 2 +-
 hbase-shell/pom.xml  | 2 +-
 hbase-testing-util/pom.xml   | 2 +-
 hbase-thrift/pom.xml | 2 +-
 pom.xml  | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-annotations/pom.xml
--
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 19db565..386b92f 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-assembly/pom.xml
--
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index fae8ace..bf66e22 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
   hbase-assembly

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-checkstyle/pom.xml
--
diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index e323aa7..0d397f6 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -24,14 +24,14 @@
 4.0.0
 org.apache.hbase
 hbase-checkstyle
-1.1.2
+1.1.3-SNAPSHOT
 Apache HBase - Checkstyle
 Module to hold Checkstyle properties for HBase.
 
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-client/pom.xml
--
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 4d40071..f0f8a07 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -24,7 +24,7 @@
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-common/pom.xml
--
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index c0d71b3..008f58c 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-examples/pom.xml
--
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 75a55b0..b3b4586 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
   
   hbase-examples

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-hadoop-compat/pom.xml
--
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index 7f203a3..65e9b6a 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
 
 hbase
 org.apache.hbase
-1.1.2
+1.1.3-SNAPSHOT
 ..
 
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f2ee252/hbase-ha

Git Push Summary

2015-09-01 Thread ndimiduk
Repository: hbase
Updated Tags:  refs/tags/1.1.2 [created] c41513184


svn commit: r10378 - /release/hbase/1.1.2/

2015-09-01 Thread ndimiduk
Author: ndimiduk
Date: Tue Sep  1 16:14:50 2015
New Revision: 10378

Log:
publish HBase 1.1.2

Added:
release/hbase/1.1.2/
  - copied from r10377, dev/hbase/hbase-1.1.2RC2/