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 29D29200B78 for ; Fri, 2 Sep 2016 23:24:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 286CB160AAE; Fri, 2 Sep 2016 21:24:28 +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 6E7C9160A8C for ; Fri, 2 Sep 2016 23:24:27 +0200 (CEST) Received: (qmail 59879 invoked by uid 500); 2 Sep 2016 21:24:26 -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 59870 invoked by uid 99); 2 Sep 2016 21:24:26 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2016 21:24:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 44F26C0439 for ; Fri, 2 Sep 2016 21:24:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id jX75ScANDlIG for ; Fri, 2 Sep 2016 21:24:25 +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 993F85F39A for ; Fri, 2 Sep 2016 21:24:24 +0000 (UTC) Received: (qmail 59230 invoked by uid 99); 2 Sep 2016 21:24:23 -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; Fri, 02 Sep 2016 21:24:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FB80DFB89; Fri, 2 Sep 2016 21:24:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sandhya@apache.org To: commits@trafodion.incubator.apache.org Date: Fri, 02 Sep 2016 21:24:24 -0000 Message-Id: <74ed320714144daf8bd09afc1a68278c@git.apache.org> In-Reply-To: <192da4a266e34a6a924fcd8246e46cb9@git.apache.org> References: <192da4a266e34a6a924fcd8246e46cb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-trafodion git commit: Merge remote branch 'origin/pr/687/head' into merge_687 archived-at: Fri, 02 Sep 2016 21:24:28 -0000 Merge remote branch 'origin/pr/687/head' into merge_687 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c7bcf305 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c7bcf305 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c7bcf305 Branch: refs/heads/master Commit: c7bcf3050e1d0ab6d844df65545c494c15b3e835 Parents: f7ed14f 8d75967 Author: Sandhya Sundaresan Authored: Fri Sep 2 21:23:58 2016 +0000 Committer: Sandhya Sundaresan Committed: Fri Sep 2 21:23:58 2016 +0000 ---------------------------------------------------------------------- core/sql/cli/Cli.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------