Repository: ambari Updated Branches: refs/heads/trunk 89dc6c1c5 -> 4ae9bb9c8
AMBARI-8648. Fix hadoop-sink rpm build to create symlink in postinstall scriptlet. Phoenix tests dependency fix. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ae9bb9c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ae9bb9c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ae9bb9c Branch: refs/heads/trunk Commit: 4ae9bb9c86bb08e2a829b16e4c66d200b7f94208 Parents: 89dc6c1 Author: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Authored: Thu Dec 11 00:49:45 2014 +0200 Committer: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Committed: Thu Dec 11 00:51:00 2014 +0200 ---------------------------------------------------------------------- ambari-metrics/ambari-metrics-timelineservice/pom.xml | 5 +++-- .../metrics/timeline/AbstractMiniHBaseClusterTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae9bb9c/ambari-metrics/ambari-metrics-timelineservice/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index dca1772..49d29a5 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -488,8 +488,9 @@ <!-- for unit tests only --> <dependency> <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-core-tests</artifactId> - <version>4.2.0</version> + <artifactId>phoenix-core</artifactId> + <type>test-jar</type> + <version>4.2.0.2.2.0.0-2041</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae9bb9c/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java index 96b8a83..2ca7669 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java @@ -57,7 +57,7 @@ public abstract class AbstractMiniHBaseClusterTest extends BaseTest { @AfterClass public static void doTeardown() throws Exception { - dropNonSystemTables(); + dropAllTables(); } @After
