You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by fb...@apache.org on 2015/05/29 22:32:36 UTC
ambari git commit: AMBARI-11543 [WinTP2] Windows build is broken -
missing ambari_simplejson module
Repository: ambari
Updated Branches:
refs/heads/trunk 8f077e154 -> f8a5cc1d5
AMBARI-11543 [WinTP2] Windows build is broken - missing ambari_simplejson module
Added the missing module references.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8a5cc1d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8a5cc1d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8a5cc1d
Branch: refs/heads/trunk
Commit: f8a5cc1d5ccc4457ca767428f95a915d022f1b4a
Parents: 8f077e1
Author: Florian Barca <fb...@hortonworks.com>
Authored: Fri May 29 13:20:38 2015 -0700
Committer: Florian Barca <fb...@hortonworks.com>
Committed: Fri May 29 13:20:38 2015 -0700
----------------------------------------------------------------------
ambari-agent/src/packages/windows.xml | 4 ++++
ambari-server/src/main/assemblies/server-windows.xml | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8a5cc1d/ambari-agent/src/packages/windows.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/src/packages/windows.xml b/ambari-agent/src/packages/windows.xml
index d4dbe0f..e393df8 100644
--- a/ambari-agent/src/packages/windows.xml
+++ b/ambari-agent/src/packages/windows.xml
@@ -45,6 +45,10 @@
<outputDirectory>/sbin/ambari_jinja2</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${basedir}/../ambari-common/src/main/python/ambari_simplejson</directory>
+ <outputDirectory>/sbin/ambari_simplejson</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/conf/windows</directory>
<outputDirectory>/</outputDirectory>
<excludes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8a5cc1d/ambari-server/src/main/assemblies/server-windows.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server-windows.xml b/ambari-server/src/main/assemblies/server-windows.xml
index f4ba5a7..191fcfb 100644
--- a/ambari-server/src/main/assemblies/server-windows.xml
+++ b/ambari-server/src/main/assemblies/server-windows.xml
@@ -117,6 +117,10 @@
<outputDirectory>ambari-server-${project.version}/sbin/ambari_jinja2</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${basedir}/../ambari-common/src/main/python/ambari_simplejson</directory>
+ <outputDirectory>ambari-server-${project.version}/sbin/ambari_simplejson</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${basedir}/../ambari-common/src/main/python/resource_management</directory>
<outputDirectory>ambari-server-${project.version}/sbin/resource_management</outputDirectory>
</fileSet>