You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/17 02:53:16 UTC

[38/50] [abbrv] hive git commit: Revert "HIVE-16501 : Add rej/orig to .gitignore"

Revert "HIVE-16501 : Add rej/orig to .gitignore"

Note: removal of *.orig files have been kept
This reverts commit c911f42035d9e7b91191e2683f85d8fd2a35eb27.


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/413245ed
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/413245ed
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/413245ed

Branch: refs/heads/hive-14535
Commit: 413245ed90f09ab446711ac37f32591e3ac68462
Parents: 0efb936
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Mon May 15 20:31:15 2017 +0200
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Mon May 15 20:33:15 2017 +0200

----------------------------------------------------------------------
 .gitignore | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/413245ed/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8578a64..47c59da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,3 @@ hcatalog/webhcat/svr/target
 conf/hive-default.xml.template
 itests/hive-blobstore/src/test/resources/blobstore-conf.xml
 .DS_Store
-*.rej
-*.orig