You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/11/21 02:12:58 UTC
[4/4] phoenix git commit: merge master
merge master
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d3032be2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d3032be2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d3032be2
Branch: refs/heads/txn
Commit: d3032be26112b68c1b62f1b008ce71cd022cd230
Parents: 0f60099 d59846b
Author: Thomas D'Silva <td...@salesforce.com>
Authored: Fri Nov 20 17:12:36 2015 -0800
Committer: Thomas D'Silva <td...@salesforce.com>
Committed: Fri Nov 20 17:12:36 2015 -0800
----------------------------------------------------------------------
phoenix-assembly/pom.xml | 2 -
.../apache/phoenix/end2end/index/IndexIT.java | 2 +-
.../java/org/apache/phoenix/util/QueryUtil.java | 8 ---
.../java/org/apache/phoenix/query/BaseTest.java | 11 -----
phoenix-pherf/pom.xml | 17 -------
phoenix-pherf/src/main/assembly/standalone.xml | 51 --------------------
.../java/org/apache/phoenix/pherf/Pherf.java | 8 ++-
.../apache/phoenix/pherf/PherfConstants.java | 7 ++-
.../pherf/util/GoogleChartGenerator.java | 27 ++++++++---
.../phoenix/pherf/workload/WriteWorkload.java | 15 ------
10 files changed, 34 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d3032be2/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index 0438f71,695225f..d2c6267
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@@ -586,7 -629,6 +586,7 @@@ public class IndexIT extends BaseHBaseM
@Test
public void testMultipleUpdatesAcrossRegions() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String testTable = fullTableName+"_testMultipleUpdatesAcrossRegions";
++ String testTable = fullTableName+"_MULTIPLE_UPDATES";
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
String query;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d3032be2/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------