diff options
| author | Nate Cole <ncole@hortonworks.com> | 2016-02-11 08:46:52 -0500 |
|---|---|---|
| committer | Nate Cole <ncole@hortonworks.com> | 2016-02-11 08:46:52 -0500 |
| commit | 1809161eb5914c7905745911cecea4d9da7a3f26 (patch) | |
| tree | eb4b4e9143437f5a2963cab1a64d3f5a1ffe116a /ambari-funtest | |
| parent | 2a9f49c0e3a1839076fd271cb7caf09b3fc897f4 (diff) | |
| parent | 96bdecf8474064465b2ecc1261152d9ba68730e2 (diff) | |
Merge branch 'trunk' into branch-dev-patch-upgrade
Diffstat (limited to 'ambari-funtest')
| -rw-r--r-- | ambari-funtest/pom.xml | 5 | ||||
| -rw-r--r-- | ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml index b9c591fc68..4fa342f07f 100644 --- a/ambari-funtest/pom.xml +++ b/ambari-funtest/pom.xml @@ -496,11 +496,6 @@ <version>4.2.5</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>14.0.1</version> - </dependency> - <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>1.3.9</version> diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml index be99b830d3..fe3b860318 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml @@ -69,7 +69,7 @@ <packages> <package> <name>ambari-metrics-collector</name> - <condition>package_chooser.should_install_ams_collector()</condition> + <condition>should_install_ams_collector</condition> </package> <package> <name>ambari-metrics-monitor</name> |