ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-4780. ambari-agent conflicts with python-jinja2 (aonishuk)
Date Fri, 21 Feb 2014 14:29:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b815bd2e0 -> 2ccf7047b


AMBARI-4780. ambari-agent conflicts with python-jinja2 (aonishuk)


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

Branch: refs/heads/trunk
Commit: 2ccf7047b625017cc19ba12be65be49678fc4400
Parents: b815bd2
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Fri Feb 21 06:28:01 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Fri Feb 21 06:28:01 2014 -0800

----------------------------------------------------------------------
 ambari-agent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ccf7047/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 12a9910..cdfabfc 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -41,7 +41,7 @@
     <puppet.tar>http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz</puppet.tar>
     <agent.install.dir>/usr/lib/python2.6/site-packages/ambari_agent</agent.install.dir>
     <resmgmt.install.dir>/usr/lib/python2.6/site-packages/resource_management</resmgmt.install.dir>
-    <jinja.install.dir>/usr/lib64/python2.6/site-packages/jinja2</jinja.install.dir>
+    <jinja.install.dir>/usr/lib/python2.6/site-packages/jinja2</jinja.install.dir>
     <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
     <lib.dir>/usr/lib/ambari-agent/lib</lib.dir>
     <python.ver>python &gt;= 2.6</python.ver>


Mime
View raw message