[ https://issues.apache.org/jira/browse/HIVE-12390?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15001662#comment-15001662 ]
Xuefu Zhang commented on HIVE-12390: ------------------------------------ Minor conflicts, about slf log imports. I committed, but will attach a dummy patch to verify the tests are okay. If not, I will address them with a separate patch. > Merge master to Spark branch 11/11/2015 [Spark Branch] > ------------------------------------------------------ > > Key: HIVE-12390 > URL: https://issues.apache.org/jira/browse/HIVE-12390 > Project: Hive > Issue Type: Task > Components: Spark > Reporter: Xuefu Zhang > Assignee: Xuefu Zhang > > To fix some test failures such as those for Llap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)