Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 603C4200C36 for ; Thu, 23 Feb 2017 17:49:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5AACF160B3E; Thu, 23 Feb 2017 16:49:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 998E1160B64 for ; Thu, 23 Feb 2017 17:49:05 +0100 (CET) Received: (qmail 74755 invoked by uid 500); 23 Feb 2017 16:49:04 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 74740 invoked by uid 99); 23 Feb 2017 16:49:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2017 16:49:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 617F418D4A3 for ; Thu, 23 Feb 2017 16:49:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id L_8HPTni9OPe for ; Thu, 23 Feb 2017 16:49:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 79F045FCED for ; Thu, 23 Feb 2017 16:49:00 +0000 (UTC) Received: (qmail 74438 invoked by uid 99); 23 Feb 2017 16:48:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2017 16:48:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E03DDFF7C; Thu, 23 Feb 2017 16:48:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sureshs@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 23 Feb 2017 16:49:05 -0000 Message-Id: <49293e9841174c058e42349608758db1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] incubator-trafodion git commit: Merge Fix for [TRAFODION-2489] [TRAFODION-2490] fix for pyinstaller archived-at: Thu, 23 Feb 2017 16:49:06 -0000 Merge Fix for [TRAFODION-2489] [TRAFODION-2490] fix for pyinstaller Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cd837976 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cd837976 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cd837976 Branch: refs/heads/release2.1 Commit: cd8379764563eeb6d3195cfcddbbbfa956a316d8 Parents: 3fabd68 63f947c Author: Liu Ming Authored: Wed Feb 22 13:47:35 2017 +0000 Committer: Liu Ming Committed: Wed Feb 22 13:47:35 2017 +0000 ---------------------------------------------------------------------- install/python-installer/scripts/traf_sqconfig.py | 9 ++++++--- install/python-installer/scripts/traf_start.py | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) ----------------------------------------------------------------------