svn commit: r980980 - in /hadoop/hive/branches/branch-0.6: CHANGES.txt conf/hive-default.xml

[jv...@apache.org]

Author: jvs
Date: Fri Jul 30 21:58:10 2010
New Revision: 980980

URL: http://svn.apache.org/viewvc?rev=980980&view=rev
Log:
HIVE-1411. DataNucleus throws NucleusException if core-3.1.1 JAR
appears more than once on CLASSPATH
(Carl Steinbach via jvs)


Modified:
    hadoop/hive/branches/branch-0.6/CHANGES.txt
    hadoop/hive/branches/branch-0.6/conf/hive-default.xml

Modified: hadoop/hive/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/CHANGES.txt?rev=980980&r1=980979&r2=980980&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.6/CHANGES.txt Fri Jul 30 21:58:10 2010
@@ -569,6 +569,10 @@ Release 0.6.0 -  Unreleased
     HIVE-1492. FileSinkOperator should remove duplicated files from the same task based on file sizes.
     (Ning Zhang via He Yongqiang)
 
+    HIVE-1411. DataNucleus throws NucleusException if core-3.1.1 JAR
+    appears more than once on CLASSPATH
+    (Carl Steinbach via jvs)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/branches/branch-0.6/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/conf/hive-default.xml?rev=980980&r1=980979&r2=980980&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/conf/hive-default.xml (original)
+++ hadoop/hive/branches/branch-0.6/conf/hive-default.xml Fri Jul 30 21:58:10 2010
@@ -97,12 +97,6 @@
 </property>
 
 <property>
-  <name>datanucleus.connectionPoolingType</name>
-  <value>DBCP</value>
-  <description>Uses a DBCP connection pool for JDBC metastore</description>
-</property>
-
-<property>
   <name>javax.jdo.option.DetachAllOnCommit</name>
   <value>true</value>
   <description>detaches all objects from session so that they can be used after transaction is committed</description>
@@ -127,6 +121,12 @@
 </property>
 
 <property>
+  <name>datanucleus.connectionPoolingType</name>
+  <value>DBCP</value>
+  <description>Uses a DBCP connection pool for JDBC metastore</description>
+</property>
+
+<property>
   <name>datanucleus.validateTables</name>
   <value>false</value>
   <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
@@ -187,6 +187,12 @@
 </property>
 
 <property>
+  <name>datanucleus.plugin.pluginRegistryBundleCheck</name>
+  <value>LOG</value>
+  <description>Defines what happens when plugin bundles are found and are duplicated [EXCEPTION|LOG|NONE]</description>
+</property>
+
+<property>
   <name>hive.metastore.warehouse.dir</name>
   <value>/user/hive/warehouse</value>
   <description>location of default database for the warehouse</description>