Author: todd Date: Wed Feb 29 23:47:49 2012 New Revision: 1295342 URL: http://svn.apache.org/viewvc?rev=1295342&view=rev Log: Merge trunk into HA branch.
Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk. Resolved some conflicts around removal of VersionedProtocol, etc. Modified: hadoop/common/branches/HDFS-1623/ (props changed) hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Propchange: hadoop/common/branches/HDFS-1623/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 29 23:47:49 2012 @@ -1 +1 @@ -/hadoop/common/trunk:1152502-1294758 +/hadoop/common/trunk:1152502-1295332 Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1295342&r1=1295341&r2=1295342&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Wed Feb 29 23:47:49 2012 @@ -538,6 +538,21 @@ <version>1.8.8</version> </dependency> <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.8.8</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>1.8.8</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>1.8.8</version> + </dependency> + <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> <version>1.6.5</version> @@ -782,6 +797,7 @@ <argLine>-Xmx1024m</argLine> <environmentVariables> <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib</LD_LIBRARY_PATH> + <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX> </environmentVariables> <systemPropertyVariables>