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 68BC117496 for ; Thu, 20 Nov 2014 22:01:08 +0000 (UTC) Received: (qmail 3748 invoked by uid 500); 20 Nov 2014 22:01:08 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 3718 invoked by uid 500); 20 Nov 2014 22:01:08 -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 3709 invoked by uid 99); 20 Nov 2014 22:01:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2014 22:01:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 11B3A9468EF; Thu, 20 Nov 2014 22:01:08 +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: <15772fca77c74a9f967dc8d821c535f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-8405. SSH Bootstrap is broken (aonishuk) Date: Thu, 20 Nov 2014 22:01:08 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk c938c4840 -> dc50702ef AMBARI-8405. SSH Bootstrap is broken (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dc50702e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dc50702e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dc50702e Branch: refs/heads/trunk Commit: dc50702ef27db5a243597abd7c54f0f4f6dc1b96 Parents: c938c48 Author: Andrew Onishuk Authored: Fri Nov 21 00:00:03 2014 +0200 Committer: Andrew Onishuk Committed: Fri Nov 21 00:00:03 2014 +0200 ---------------------------------------------------------------------- ambari-server/src/main/python/setupAgent.py | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dc50702e/ambari-server/src/main/python/setupAgent.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py index e320245..ede83c5 100755 --- a/ambari-server/src/main/python/setupAgent.py +++ b/ambari-server/src/main/python/setupAgent.py @@ -209,7 +209,6 @@ def main(argv=None): checkServerReachability(hostname, server_port) - projectVersion = "1.7.0" if projectVersion == "null" or projectVersion == "{ambariVersion}" or projectVersion == "": retcode = getOptimalVersion("") else: