Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0DF99134 for ; Mon, 7 May 2012 16:35:06 +0000 (UTC) Received: (qmail 61713 invoked by uid 500); 7 May 2012 16:35:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61689 invoked by uid 500); 7 May 2012 16:35:06 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 61682 invoked by uid 99); 7 May 2012 16:35:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 16:35:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 16:35:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 31B5E238899C for ; Mon, 7 May 2012 16:34:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1335105 [2/2] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/java/org/apache/accumulo/core/constraints/ core/src/main/java/org/apache/... Date: Mon, 07 May 2012 16:34:40 -0000 To: commits@accumulo.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120507163444.31B5E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java Mon May 7 16:34:37 2012 @@ -22,11 +22,6 @@ import java.util.List; import junit.framework.TestCase; -import org.apache.accumulo.core.data.Column; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.KeyExtent; -import org.apache.accumulo.core.data.PartialKey; -import org.apache.accumulo.core.data.Range; import org.apache.hadoop.io.Text; public class RangeTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java Mon May 7 16:34:37 2012 @@ -21,8 +21,6 @@ package org.apache.accumulo.core.file.bl import java.util.LinkedList; -import org.apache.accumulo.core.file.blockfile.cache.CachedBlockQueue; - import junit.framework.TestCase; public class TestCachedBlockQueue extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java Mon May 7 16:34:37 2012 @@ -21,11 +21,6 @@ package org.apache.accumulo.core.file.bl import java.util.Random; -import org.apache.accumulo.core.file.blockfile.cache.CachedBlock; -import org.apache.accumulo.core.file.blockfile.cache.ClassSize; -import org.apache.accumulo.core.file.blockfile.cache.HeapSize; -import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache; - import junit.framework.TestCase; /** Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java Mon May 7 16:34:37 2012 @@ -24,7 +24,6 @@ import org.apache.accumulo.core.data.Byt import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile; -import org.apache.accumulo.core.file.rfile.RFile; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java Mon May 7 16:34:37 2012 @@ -33,10 +33,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.iterators.IteratorEnvironment; -import org.apache.accumulo.core.iterators.IteratorUtil; -import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import org.apache.accumulo.core.iterators.SortedMapIterator; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.system.MultiIteratorTest; import org.apache.accumulo.core.iterators.user.AgeOffFilter; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java Mon May 7 16:34:37 2012 @@ -28,8 +28,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator; -import org.apache.accumulo.core.iterators.system.CountingIterator; import org.apache.hadoop.io.Text; public class ColumnFamilySkippingIteratorTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java Mon May 7 16:34:37 2012 @@ -23,7 +23,6 @@ import junit.framework.TestCase; import org.apache.accumulo.core.data.Column; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.iterators.system.ColumnQualifierFilter; import org.apache.hadoop.io.Text; public class ColumnFilterTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java Mon May 7 16:34:37 2012 @@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.TreeMap; import java.util.Map.Entry; +import java.util.TreeMap; import junit.framework.TestCase; @@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.accumulo.core.iterators.system.DeletingIterator; import org.apache.hadoop.io.Text; public class DeletingIteratorTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java Mon May 7 16:34:37 2012 @@ -31,7 +31,6 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.accumulo.core.iterators.system.MultiIterator; import org.apache.accumulo.core.util.LocalityGroupUtil; import org.apache.hadoop.io.Text; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java Mon May 7 16:34:37 2012 @@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Val import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator; import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator.DataSource; import org.apache.hadoop.io.Text; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java Mon May 7 16:34:37 2012 @@ -19,14 +19,13 @@ package org.apache.accumulo.core.iterato import java.util.HashSet; import java.util.TreeMap; +import junit.framework.TestCase; + import org.apache.accumulo.core.data.ByteSequence; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.accumulo.core.iterators.system.TimeSettingIterator; - -import junit.framework.TestCase; public class TimeSettingIteratorTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java Mon May 7 16:34:37 2012 @@ -16,9 +16,9 @@ */ package org.apache.accumulo.core.security; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.ByteArraySet; import org.junit.Test; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java Mon May 7 16:34:37 2012 @@ -20,9 +20,6 @@ import static org.junit.Assert.assertFal import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.core.security.VisibilityEvaluator; -import org.apache.accumulo.core.security.VisibilityParseException; import org.apache.accumulo.core.util.ByteArraySet; import org.junit.Test; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java Mon May 7 16:34:37 2012 @@ -20,9 +20,7 @@ import java.net.InetSocketAddress; import junit.framework.TestCase; -import org.apache.accumulo.core.util.AddressUtil; import org.apache.hadoop.io.Text; - import org.apache.thrift.transport.TSocket; /** Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java Mon May 7 16:34:37 2012 @@ -18,10 +18,10 @@ package org.apache.accumulo.core.util; import java.util.Iterator; -import org.apache.accumulo.core.util.shell.commands.EscapeTokenizer; - import junit.framework.TestCase; +import org.apache.accumulo.core.util.shell.commands.EscapeTokenizer; + public class EscapeTokenizerTest extends TestCase { public void test1() { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java Mon May 7 16:34:37 2012 @@ -25,7 +25,6 @@ import junit.framework.Assert; import org.apache.accumulo.core.conf.ConfigurationCopy; import org.apache.accumulo.core.data.ArrayByteSequence; import org.apache.accumulo.core.data.ByteSequence; -import org.apache.accumulo.core.util.LocalityGroupUtil; import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError; import org.apache.hadoop.io.Text; import org.junit.Test; Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java Mon May 7 16:34:37 2012 @@ -16,17 +16,18 @@ */ package org.apache.accumulo.core.util; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.data.KeyExtent; -import org.apache.accumulo.core.util.Merge; import org.apache.accumulo.core.util.Merge.Size; import org.apache.hadoop.io.Text; import org.junit.Test; -import static org.junit.Assert.*; public class MergeTest { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java Mon May 7 16:34:37 2012 @@ -22,7 +22,6 @@ import java.util.TreeSet; import junit.framework.TestCase; import org.apache.accumulo.core.data.KeyExtent; -import org.apache.accumulo.core.util.MetadataTable; import org.apache.hadoop.io.Text; public class MetadataTableTest extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java Mon May 7 16:34:37 2012 @@ -16,12 +16,11 @@ */ package org.apache.accumulo.core.util; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.apache.accumulo.core.util.StringUtil; import org.junit.Test; public class TestStringUtil { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java Mon May 7 16:34:37 2012 @@ -16,8 +16,6 @@ */ package org.apache.accumulo.core.util; -import org.apache.accumulo.core.util.Version; - import junit.framework.TestCase; public class TestVersion extends TestCase { Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff ============================================================================== --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java Mon May 7 16:34:37 2012 @@ -18,7 +18,6 @@ package org.apache.accumulo.core.util; import junit.framework.TestCase; -import org.apache.accumulo.core.util.TextUtil; import org.apache.hadoop.io.Text; /** Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src/server:r1329425,1333047,1333070 Merged /incubator/accumulo/branches/1.4/src/server:r1201899-1300311,1300713-1304026,1304028-1304091,1304093-1305402 Merged /accumulo/branches/1.4/src/server:r1305403-1305434,1305436-1305459,1305461-1306572,1306574-1309371,1309373-1324770,1324772-1324853,1325064,1325854-1325858,1325931-1326655,1327193-1328079,1328081,1328482-1329419,1329421-1329497,1329499-1330266,1331389-1331455,1332720-1334979,1334981-1335072 Merged /accumulo/branches/1.3/src/server:r1309369 Merged /accumulo/branches/1.4/server:r1329792-1330266,1332720-1333108,1333110-1333189,1333191-1334979,1334981-1335045 Merged /incubator/accumulo/trunk/src/server:r1178656-1201898 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1305403-1328481,1329420,1329498,1329792-1333108,1333110-1333189,1333191-1334979,1334981-1335045 Merged /incubator/accumulo/branches/1.3/src:r1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 Merged /incubator/accumulo/branches/1.4/src:r1201902-1305402 Merged /incubator/accumulo/branches/1.3.5rc/src:r1209938 Merged /incubator/accumulo/trunk/src:r1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495 Merged /accumulo/trunk/src/src:r1332224,1332278,1332347 Merged /accumulo/branches/1.3/src/src:r1330246 Merged /accumulo/branches/1.4/src/src:r1305403-1330267,1331388-1331456,1332720-1334979,1334981-1335072 Merged /incubator/accumulo/branches/1.4.0rc/src/src:r1304025 Merged /incubator/accumulo/branches/1.4/src/src:r1201899-1300311,1300713-1305402 Merged /incubator/accumulo/trunk/src/src:r1178656-1201898 Merged /incubator/accumulo/branches/1.4.0rc/src:r1304025,1305326 Merged /accumulo/trunk:r1329425 Merged /accumulo/branches/1.3/src:r1309369,1328076,1330264,1330944