carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject [2/3] incubator-carbondata git commit: resolved merge conflict from master
Date Mon, 12 Dec 2016 04:50:18 GMT
resolved merge conflict from master


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/8e036486
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/8e036486
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/8e036486

Branch: refs/heads/master
Commit: 8e036486b8cbf14ade8ccfc4dcc7aec11a093c48
Parents: 05c02ef
Author: anubhav100 <anubhav.tarar@knoldus.in>
Authored: Tue Dec 6 14:28:43 2016 +0530
Committer: anubhav100 <anubhav.tarar@knoldus.in>
Committed: Sun Dec 11 19:32:25 2016 +0530

----------------------------------------------------------------------
 .../allqueries/AllDataTypesTestCase1.scala      | 4004 ++----------------
 1 file changed, 385 insertions(+), 3619 deletions(-)
----------------------------------------------------------------------



Mime
View raw message