ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject [01/30] ambari git commit: AMBARI-5707. Replace Ganglia with high performant and pluggable Metrics System. Rat check fix. (swagle)
Date Tue, 02 Dec 2014 17:28:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c6f574349 -> 93b8348fa


AMBARI-5707. Replace Ganglia with high performant and pluggable Metrics System. Rat check
fix. (swagle)


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

Branch: refs/heads/trunk
Commit: 93b8348fabb4a50e2ed95ed1b98fea7fff4b2ab1
Parents: a52f8a5
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Dec 2 09:26:32 2014 -0800
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Dec 2 09:26:41 2014 -0800

----------------------------------------------------------------------
 .../server/controller/internal/AbstractProviderModule.java       | 2 +-
 pom.xml                                                          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/93b8348f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index d1a2330..7b734cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -547,7 +547,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
Resource
             ComponentSSLConfiguration.instance(),
             this,
             PropertyHelper.getPropertyId("Clusters", "cluster_name")));
-            providers.add(new AlertSummaryPropertyProvider(type,
+          providers.add(new AlertSummaryPropertyProvider(type,
             "Clusters/cluster_name", null));
           break;
         case Service:

http://git-wip-us.apache.org/repos/asf/ambari/blob/93b8348f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa2ca31..87fb4b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,10 +255,14 @@
             <!--Velocity log -->
             <exclude>**/velocity.log*</exclude>
 
+            <!-- Metrics module -->
             <!-- psutil : external lib, Apache 2.0 license included as a source file -->
             <exclude>ambari-metrics/ambari-metrics-host-monitoring/src/main/python/psutil/**</exclude>
+            <exclude>ambari-metrics/target/rpm/ambari-metrics/SPECS/ambari-metrics.spec</exclude>
             <exclude>ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom</exclude>
             <exclude>ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml</exclude>
+            <exclude>ambari-metrics/*/target/**</exclude>
+
           </excludes>
         </configuration>
         <executions>


Mime
View raw message