Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-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 477CD190E6 for ; Thu, 21 Apr 2016 21:47:52 +0000 (UTC) Received: (qmail 82470 invoked by uid 500); 21 Apr 2016 21:47:52 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 82434 invoked by uid 500); 21 Apr 2016 21:47:52 -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 82420 invoked by uid 99); 21 Apr 2016 21:47:52 -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, 21 Apr 2016 21:47:52 +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 24523180558 for ; Thu, 21 Apr 2016 21:47:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 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=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Rv8kjDIJKXFO for ; Thu, 21 Apr 2016 21:47:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id A7A095F2F2 for ; Thu, 21 Apr 2016 21:47:49 +0000 (UTC) Received: (qmail 82392 invoked by uid 99); 21 Apr 2016 21:47:49 -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, 21 Apr 2016 21:47:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 191C3E0534; Thu, 21 Apr 2016 21:47:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: svarnau@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 21 Apr 2016 21:47:51 -0000 Message-Id: <629a84699e8f403f82cff81817bb4c0c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/13] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ac4fa8f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ac4fa8f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ac4fa8f2 Branch: refs/heads/master Commit: ac4fa8f2c36ee5dc13726529d05f4113cb87f7be Parents: ad27625 e6ff37d Author: Amanda Moran Authored: Tue Apr 19 00:07:22 2016 +0000 Committer: Amanda Moran Committed: Tue Apr 19 00:07:22 2016 +0000 ---------------------------------------------------------------------- NOTICE | 2 +- core/sqf/sqenvcom.sh | 2 +- .../hadoop/hbase/regionserver/transactional/IdTmId.java | 10 ---------- win-odbc64/odbcclient/DSNConverter/DSNConverter.def | 2 +- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 2 +- win-odbc64/odbcclient/TranslationDll/TranslationDll.def | 2 +- win-odbc64/odbcclient/TranslationDll/TranslationDll.rc | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 2 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 2 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 2 +- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 2 +- 12 files changed, 11 insertions(+), 21 deletions(-) ----------------------------------------------------------------------