ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fba...@apache.org
Subject ambari git commit: AMBARI-8963 Metric Monitor start fails on CentOS after WIN changes
Date Tue, 30 Dec 2014 21:25:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 321cdbf36 -> b768b9e95


AMBARI-8963 Metric Monitor start fails on CentOS after WIN changes

Fixed the psutils path


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

Branch: refs/heads/trunk
Commit: b768b9e9562aa81ad7bfc80516f6e342083652de
Parents: 321cdbf
Author: Florian Barca <fbarca@hortonworks.com>
Authored: Tue Dec 30 13:23:57 2014 -0800
Committer: Florian Barca <fbarca@hortonworks.com>
Committed: Tue Dec 30 13:25:22 2014 -0800

----------------------------------------------------------------------
 .../ambari-metrics-assembly/src/main/assembly/monitor-windows.xml  | 2 +-
 .../src/main/python/core/__init__.py                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b768b9e9/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
index 65a936b..3b877a7 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
@@ -52,7 +52,7 @@
     </fileSet>
     <fileSet>
       <directory>${monitor.dir}/target/psutil_build</directory>
-      <outputDirectory>/sbin/core/psutil/build</outputDirectory>
+      <outputDirectory>/sbin/psutil/build</outputDirectory>
       <includes>
         <include>*.egg</include>
       </includes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b768b9e9/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
index 15ad117..eb87cb5 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
+++ b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
@@ -21,7 +21,7 @@ limitations under the License.
 import os, sys
 
 path = os.path.abspath(__file__)
-path = os.path.normpath(os.path.join(os.path.dirname(path), "psutil", "build"))
+path = os.path.join(os.path.dirname(os.path.dirname(path)), "psutil", "build")
 
 for dir in os.walk(path).next()[1]:
   if 'lib' in dir:


Mime
View raw message