1
0

Rebasing and fixing conflicts against master

This commit is contained in:
Vinoth Chandar
2018-09-08 03:52:49 +08:00
committed by vinoth chandar
parent a5359662be
commit eca49a255e
13 changed files with 21 additions and 16 deletions

View File

@@ -185,6 +185,11 @@
</plugin>
</plugins>
</build>
<properties>
<checkstyle.skip>true</checkstyle.skip>
</properties>
<profiles>
<profile>
<id>hive12</id>

View File

@@ -192,6 +192,10 @@
</plugins>
</build>
<properties>
<checkstyle.skip>true</checkstyle.skip>
</properties>
<profiles>
<profile>
<id>hive12</id>

View File

@@ -33,6 +33,7 @@
<properties>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<checkstyle.skip>true</checkstyle.skip>
</properties>
<build>