Skip to content

Commit

Permalink
Preparations for release v1.2.3-beta-04
Browse files Browse the repository at this point in the history
  • Loading branch information
dvimont committed Sep 13, 2016
1 parent 7211436 commit 8faa306
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions 1.2.2/pom.xml → 1.2.3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<parent>
<groupId>org.commonvox</groupId>
<artifactId>hbase-column-manager-parent-pom</artifactId>
<version>1.x-SNAPSHOT</version>
<version>1.2.3-beta-04</version>
</parent>

<properties>
<hbaseVersion>1.2.2</hbaseVersion>
<hbaseVersion>1.2.3</hbaseVersion>
</properties>
<artifactId>hbase-column-manager</artifactId>
<version>1.2.2-beta-SNAPSHOT</version>
<version>1.2.3-beta-04</version>
<packaging>jar</packaging>

<name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™</name>
Expand Down
6 changes: 3 additions & 3 deletions master/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>org.commonvox</groupId>
<artifactId>hbase-column-manager-parent-pom</artifactId>
<version>1.x-SNAPSHOT</version>
<version>1.2.3-beta-04</version>
</parent>

<properties>
<hbaseVersion>1.2.2</hbaseVersion>
<hbaseVersion>1.2.3</hbaseVersion>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<artifactId>hbase-column-manager</artifactId>
<version>1.2-master-beta-SNAPSHOT</version>
<version>1.2.3-master-beta-04</version>
<packaging>jar</packaging>

<name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™</name>
Expand Down
42 changes: 21 additions & 21 deletions master/src/main/java/org/commonvox/hbase_column_manager/MTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -676,27 +676,27 @@ public int hashCode() {
return wrappedTable.hashCode();
}

// beginning of overrides of methods introduced in HBase 1.2.2
@Override
public void setOperationTimeout(int i) {
wrappedTable.setOperationTimeout(i);
}

@Override
public int getOperationTimeout() {
return wrappedTable.getOperationTimeout();
}

@Override
public void setRpcTimeout(int i) {
wrappedTable.setRpcTimeout(i);
}

@Override
public int getRpcTimeout() {
return wrappedTable.getRpcTimeout();
}
// end of overrides of methods introduced in HBase 1.2.2
// beginning of overrides of methods introduced in HBase 1.2.2, removed again in 1.2.3
// @Override
// public void setOperationTimeout(int i) {
// wrappedTable.setOperationTimeout(i);
// }
//
// @Override
// public int getOperationTimeout() {
// return wrappedTable.getOperationTimeout();
// }
//
// @Override
// public void setRpcTimeout(int i) {
// wrappedTable.setRpcTimeout(i);
// }
//
// @Override
// public int getRpcTimeout() {
// return wrappedTable.getRpcTimeout();
// }
// end of overrides of methods introduced in HBase 1.2.2, removed again in 1.2.3

/**
* ResultScannerForAliasedFamilies wraps the ResultScanner returned by Table#getScanner
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>org.commonvox</groupId>
<artifactId>hbase-column-manager-parent-pom</artifactId>
<version>1.x-SNAPSHOT</version>
<version>1.2.3-beta-04</version>
<packaging>pom</packaging>

<name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™ parent POM</name>
Expand All @@ -38,7 +38,7 @@
TESTING should be done separately for each build after having started up an instance of hbase
using that build's corresponding hbase release. -->
<module>master</module>
<module>1.2.2</module>
<module>1.2.3</module>
</modules>

<licenses>
Expand Down

0 comments on commit 8faa306

Please sign in to comment.