Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AAF4510FD6 for ; Fri, 21 Feb 2014 14:29:34 +0000 (UTC) Received: (qmail 35330 invoked by uid 500); 21 Feb 2014 14:29:34 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 35257 invoked by uid 500); 21 Feb 2014 14:29:33 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 35249 invoked by uid 99); 21 Feb 2014 14:29:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Feb 2014 14:29:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CBB0482E156; Fri, 21 Feb 2014 14:29:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Message-Id: <8ba2026fb1444528b4a3b63306ed477d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4780. ambari-agent conflicts with python-jinja2 (aonishuk) Date: Fri, 21 Feb 2014 14:29:31 +0000 (UTC) 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 Authored: Fri Feb 21 06:28:01 2014 -0800 Committer: Andrew Onischuk 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 @@ http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz /usr/lib/python2.6/site-packages/ambari_agent /usr/lib/python2.6/site-packages/resource_management - /usr/lib64/python2.6/site-packages/jinja2 + /usr/lib/python2.6/site-packages/jinja2 http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz /usr/lib/ambari-agent/lib python >= 2.6