Author: brock
Date: Thu Nov 6 17:41:32 2014
New Revision: 1637171
URL: http://svn.apache.org/r1637171
Log:
Merge HIVE-8698 - default log4j.properties not included in jar files anymore
(Thejas via Brock)
Modified:
hive/branches/branch-0.14/ (props changed)
hive/branches/branch-0.14/common/pom.xml
Propchange: hive/branches/branch-0.14/
------------------------------------------------------------------------------
Merged /hive/trunk:r1637170
Modified: hive/branches/branch-0.14/common/pom.xml
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/common/pom.xml?rev=1637171&r1=1637170&r2=1637171&view=diff
==============================================================================
--- hive/branches/branch-0.14/common/pom.xml (original)
+++ hive/branches/branch-0.14/common/pom.xml Thu Nov 6 17:41:32 2014
@@ -118,14 +118,6 @@
<profile>
<id>dist</id>
<build>
- <resources>
- <resource>
- <directory>../conf/</directory>
- <includes>
- <include>hive-default.xml.template</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
