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 422F3200C61 for ; Tue, 25 Apr 2017 17:45:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 40D73160BB6; Tue, 25 Apr 2017 15:45:55 +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 AE2D4160BB3 for ; Tue, 25 Apr 2017 17:45:54 +0200 (CEST) Received: (qmail 17002 invoked by uid 500); 25 Apr 2017 15:45:53 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 16678 invoked by uid 99); 25 Apr 2017 15:45:53 -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; Tue, 25 Apr 2017 15:45:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7140EDF999; Tue, 25 Apr 2017 15:45:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hashutosh@apache.org To: commits@hive.apache.org Date: Tue, 25 Apr 2017 15:45:55 -0000 Message-Id: In-Reply-To: <12ca7f87e35f4c06b0da23ffb3aeb690@git.apache.org> References: <12ca7f87e35f4c06b0da23ffb3aeb690@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hive git commit: HIVE-16501 : Add rej/orig to .gitignore ; remove *.orig files (Zoltan Haindrich via Ashutosh Chauhan) archived-at: Tue, 25 Apr 2017 15:45:55 -0000 HIVE-16501 : Add rej/orig to .gitignore ; remove *.orig files (Zoltan Haindrich via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c911f420 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c911f420 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c911f420 Branch: refs/heads/master Commit: c911f42035d9e7b91191e2683f85d8fd2a35eb27 Parents: f1e0b4f Author: Zoltan Haindrich Authored: Tue Apr 25 08:45:10 2017 -0700 Committer: Ashutosh Chauhan Committed: Tue Apr 25 08:45:10 2017 -0700 ---------------------------------------------------------------------- .gitignore | 2 + .../hive/ql/parse/CalcitePlanner.java.orig | 4188 ----- .../hive/ql/parse/SemanticAnalyzer.java.orig | 13508 ----------------- 3 files changed, 2 insertions(+), 17696 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/c911f420/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 47c59da..8578a64 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ hcatalog/webhcat/svr/target conf/hive-default.xml.template itests/hive-blobstore/src/test/resources/blobstore-conf.xml .DS_Store +*.rej +*.orig