[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c941e13 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c941e13 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c941e13 Branch: refs/heads/master Commit: 6c941e13048094062b7dcffe1cc4bccd73f8e80e Parents: 858288b 90377b6 Author: Eric C. Newton eric.new...@gmail.com Authored: Fri Apr 25 11:29:45 2014 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Fri Apr 25 11:29:45 2014 -0400 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/36a97ac0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36a97ac0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36a97ac0
Branch: refs/heads/master
Commit: 36a97ac019165804c2ce27984c9cc15f854ae874
Parents: 3086472 6ea1ead
Author: Christopher Tubbs ctubb...@apache.org
Authored: Mon Apr 21 16:10:14 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Mon Apr 21 16:10:14 2014 -0400
--
core/pom.xml| 7 +
core/src/main/findbugs/exclude-filter.xml | 36 +
pom.xml | 26 +++-
proxy/pom.xml | 13 ++
proxy/src/main/findbugs/exclude-filter.xml | 21 +++
.../server/security/SecurityOperation.java | 8 +-
.../server/security/SystemCredentials.java | 51 ---
.../server/security/SystemCredentialsIT.java| 148 +++
trace/pom.xml | 13 ++
trace/src/main/findbugs/exclude-filter.xml | 21 +++
10 files changed, 313 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/core/pom.xml
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/pom.xml
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/proxy/pom.xml
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
--
diff --cc
server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
index d99f104,b5d7aba..63528a3
---
a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
@@@ -91,8 -89,9 +90,9 @@@ public final class SystemCredentials ex
private SystemToken(byte[] systemPassword) {
super(systemPassword);
}
-
- private static SystemToken get() {
+
+ private static SystemToken get(Instance instance) {
- byte[] instanceIdBytes =
instance.getInstanceID().getBytes(Constants.UTF8);
++ byte[] instanceIdBytes =
instance.getInstanceID().getBytes(StandardCharsets.UTF_8);
byte[] confChecksum;
MessageDigest md;
try {
@@@ -100,11 -99,11 +100,11 @@@
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(Failed to compute configuration
checksum, e);
}
-
+
// seed the config with the version and instance id, so at least it's
not empty
-
md.update(ServerConstants.WIRE_VERSION.toString().getBytes(Constants.UTF8));
+
md.update(ServerConstants.WIRE_VERSION.toString().getBytes(StandardCharsets.UTF_8));
-
md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(StandardCharsets.UTF_8));
-
+ md.update(instanceIdBytes);
+
for (EntryString,String entry :
ServerConfiguration.getSiteConfiguration()) {
// only include instance properties
if (entry.getKey().startsWith(Property.INSTANCE_PREFIX.toString())) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/trace/pom.xml
--
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9035be17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9035be17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9035be17 Branch: refs/heads/master Commit: 9035be1773f6d61a353c62f489e64db5e9ed2038 Parents: 810dbd1 534b0e7 Author: Christopher Tubbs ctubb...@apache.org Authored: Thu Apr 10 13:37:29 2014 -0400 Committer: Christopher Tubbs ctubb...@apache.org Committed: Thu Apr 10 13:37:29 2014 -0400 -- docs/pom.xml | 1 + pom.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9035be17/docs/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9035be17/pom.xml --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8485134d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8485134d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8485134d Branch: refs/heads/master Commit: 8485134d78092abddeffe99da17ba7182da98f65 Parents: be9cd71 5d030ca Author: Keith Turner ktur...@apache.org Authored: Thu Mar 27 12:46:15 2014 -0400 Committer: Keith Turner ktur...@apache.org Committed: Thu Mar 27 12:46:15 2014 -0400 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/86ed88a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86ed88a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/86ed88a1
Branch: refs/heads/master
Commit: 86ed88a169c14e7fc9c673804ee6240e07a02336
Parents: 2849cbd 40299f8
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Mar 27 15:06:10 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Mar 27 15:06:10 2014 -0400
--
.../accumulo/core/conf/ConfigurationDocGen.java | 341 +++
.../core/conf/DefaultConfiguration.java | 131 +--
.../org/apache/accumulo/core/conf/Property.java | 135
.../apache/accumulo/core/conf/PropertyType.java | 66 ++--
.../accumulo/core/conf/config-header.html | 90 +
.../apache/accumulo/core/conf/config-header.tex | 99 ++
.../org/apache/accumulo/core/conf/config.html | 90 -
.../apache/accumulo/core/conf/PropertyTest.java | 49 +--
docs/pom.xml| 41 +++
.../accumulo_user_manual.tex| 8 +-
.../chapters/administration.tex | 70 ++--
.../accumulo_user_manual/chapters/analytics.tex | 88 ++---
.../accumulo_user_manual/chapters/clients.tex | 92 ++---
.../chapters/development_clients.tex| 44 +--
.../chapters/high_speed_ingest.tex | 18 +-
.../chapters/multivolume.tex| 12 +-
.../accumulo_user_manual/chapters/security.tex | 30 +-
.../accumulo_user_manual/chapters/shell.tex | 43 +--
.../chapters/table_configuration.tex| 219 +---
.../chapters/table_design.tex | 60 ++--
.../chapters/troubleshooting.tex| 215 ++--
.../impl/MiniAccumuloConfigImpl.java| 6 +-
.../accumulo/monitor/servlets/trace/Basic.java | 2 +-
.../org/apache/accumulo/tracer/TraceServer.java | 58 ++--
.../classloader/vfs/AccumuloVFSClassLoader.java | 115 +++
25 files changed, 1152 insertions(+), 970 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/86ed88a1/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index a98d794,030e88a..843d126
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@@ -24,27 -22,13 +22,23 @@@ import java.io.UnsupportedEncodingExcep
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
- import java.util.TreeMap;
import org.apache.accumulo.core.Constants;
- import org.apache.log4j.Logger;
+/**
+ * An {@link AccumuloConfiguration} that contains only default values for
+ * properties. This class is a singleton.
+ */
public class DefaultConfiguration extends AccumuloConfiguration {
private static DefaultConfiguration instance = null;
- private static Logger log = Logger.getLogger(DefaultConfiguration.class);
private MapString,String resolvedProps = null;
+ /**
+ * Gets an instance of this class.
+ *
+ * @return default configuration
+ * @throws RuntimeException if the default configuration is invalid
+ */
synchronized public static DefaultConfiguration getInstance() {
if (instance == null) {
instance = new DefaultConfiguration();
@@@ -76,128 -60,11 +70,13 @@@
props.put(entry.getKey(), entry.getValue());
}
- /*
- * Used by the monitor to show configuration properties
+ /**
-* Generates HTML documentation on the default configuration.
++ * Generates HTML documentation on the default configuration. Used by the
monitor to show configuration properties.
+ *
+ * @param doc stream to write HTML to
*/
protected static void generateDocumentation(PrintStream doc) {
- // read static content from resources and output
- InputStream data =
DefaultConfiguration.class.getResourceAsStream(config.html);
- if (data != null) {
- byte[] buffer = new byte[1024];
- int n;
- try {
- while ((n = data.read(buffer)) 0)
- doc.print(new String(buffer, 0, n, Constants.UTF8));
- } catch (IOException e) {
- e.printStackTrace();
- return;
- } finally {
- try {
- data.close();
- } catch (IOException ex) {
- log.error(ex, ex);
- }
-
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4eb5237e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4eb5237e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4eb5237e Branch: refs/heads/master Commit: 4eb5237e27b655d41e7e513751341671955dc034 Parents: b40ce8e d77fd6f Author: Eric C. Newton eric.new...@gmail.com Authored: Tue Mar 25 13:01:54 2014 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Tue Mar 25 13:01:54 2014 -0400 -- .../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 3 +++ 1 file changed, 3 insertions(+) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe5fc305 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe5fc305 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe5fc305 Branch: refs/heads/master Commit: fe5fc3056785b560a3b677824b56d7f2c408a8f9 Parents: ea07664 8f98331 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:19:06 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:19:06 2014 -0400 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04d8cd8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04d8cd8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04d8cd8d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 04d8cd8d4dbe6189a072a389344282513446dad7 Parents: 7d70ef5 bd970de Author: Eric Newton eric.new...@gmail.com Authored: Fri Feb 28 12:52:55 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Feb 28 12:52:55 2014 -0500 -- .../apache/accumulo/core/client/impl/Tables.java | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07604ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07604ca0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07604ca0 Branch: refs/heads/master Commit: 07604ca058c5927eb20468ab7c983f039243e145 Parents: 90b6619 7d70ef5 Author: Eric Newton eric.new...@gmail.com Authored: Fri Feb 28 12:52:30 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Feb 28 12:52:30 2014 -0500 -- .../apache/accumulo/fate/zookeeper/ZooLock.java | 6 ++ .../test/functional/BackupMasterIT.java | 63 2 files changed, 69 insertions(+) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5f80656
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5f80656
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5f80656
Branch: refs/heads/master
Commit: c5f80656a40fd07e3ac4f25f68e1502b2d1951ba
Parents: 6699800 59716f0
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Feb 26 15:58:51 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Feb 26 15:58:51 2014 -0500
--
.../apache/accumulo/tserver/log/DfsLogger.java | 137 +--
1 file changed, 65 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5f80656/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index e52f739,55df118..1504c94
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@@ -320,10 -318,10 +319,10 @@@ public class DfsLogger
}
return new DFSLoggerInputStreams(input, decryptingInput);
}
-
+
public synchronized void open(String address) throws IOException {
String filename = UUID.randomUUID().toString();
-String logger = StringUtil.join(Arrays.asList(address.split(:)), +);
+String logger = Joiner.on(+).join(address.split(:));
log.debug(DfsLogger.open() begin);
VolumeManager fs = conf.getFileSystem();
@@@ -540,7 -532,7 +533,7 @@@
public String getLogger() {
String parts[] = logPath.split(/);
-return StringUtil.join(Arrays.asList(parts[parts.length -
2].split([+])), :);
+return Joiner.on(:).join(parts[parts.length - 2].split([+]));
}
-
+
}
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/08f0b9ac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/08f0b9ac Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/08f0b9ac Branch: refs/heads/master Commit: 08f0b9ac1691b1d078a691a2b819df56512aa318 Parents: 5f72696 2ef2d88 Author: Keith Turner ktur...@apache.org Authored: Tue Feb 25 11:21:52 2014 -0500 Committer: Keith Turner ktur...@apache.org Committed: Tue Feb 25 11:21:52 2014 -0500 -- .../org/apache/accumulo/core/conf/Property.java | 12 +- .../core/tabletserver/log/LogEntry.java | 12 +- .../chapters/multivolume.tex| 46 ++- .../apache/accumulo/server/ServerConstants.java | 115 +-- .../accumulo/server/fs/VolumeManager.java | 99 +++--- .../accumulo/server/fs/VolumeManagerImpl.java | 93 +++--- .../apache/accumulo/server/fs/VolumeUtil.java | 330 +++ .../apache/accumulo/server/init/Initialize.java | 36 +- .../server/master/recovery/HadoopLogCloser.java | 3 +- .../org/apache/accumulo/server/util/Admin.java | 11 + .../accumulo/server/util/ListVolumesUsed.java | 141 .../accumulo/server/util/MetadataTableUtil.java | 42 ++- .../apache/accumulo/server/fs/FileTypeTest.java | 54 +++ .../accumulo/server/fs/VolumeUtilTest.java | 144 .../accumulo/gc/SimpleGarbageCollector.java | 94 +++--- .../master/recovery/RecoveryManager.java| 10 + .../monitor/servlets/DefaultServlet.java| 2 +- .../tserver/DirectoryDecommissioner.java| 169 -- .../org/apache/accumulo/tserver/Tablet.java | 21 +- .../apache/accumulo/tserver/TabletServer.java | 2 + .../tserver/DirectoryDecommissionerTest.java| 108 -- .../tserver/TabletServerSyncCheckTest.java | 14 +- .../org/apache/accumulo/test/CleanWalIT.java| 3 +- .../test/ConfigurableMajorCompactionIT.java | 3 +- .../org/apache/accumulo/test/DumpConfigIT.java | 3 +- .../test/MasterRepairsDualAssignmentIT.java | 3 +- .../accumulo/test/NoMutationRecoveryIT.java | 8 +- .../java/org/apache/accumulo/test/VolumeIT.java | 174 +++--- .../functional/BalanceAfterCommsFailureIT.java | 3 +- .../test/functional/BatchScanSplitIT.java | 3 +- .../test/functional/BigRootTabletIT.java| 3 +- .../test/functional/BinaryStressIT.java | 3 +- .../accumulo/test/functional/BloomFilterIT.java | 3 +- .../functional/BulkSplitOptimizationIT.java | 3 +- .../test/functional/ChaoticBalancerIT.java | 3 +- .../accumulo/test/functional/CleanTmpIT.java| 3 +- .../accumulo/test/functional/CompactionIT.java | 3 +- .../accumulo/test/functional/ConcurrencyIT.java | 3 +- .../functional/ConfigurableCompactionIT.java| 3 +- .../test/functional/ConfigurableMacIT.java | 19 +- .../test/functional/DeleteEverythingIT.java | 3 +- .../test/functional/DynamicThreadPoolsIT.java | 3 +- .../test/functional/GarbageCollectorIT.java | 3 +- .../test/functional/HalfDeadTServerIT.java | 3 +- .../accumulo/test/functional/LargeRowIT.java| 3 +- .../test/functional/LateLastContactIT.java | 3 +- .../test/functional/MasterFailoverIT.java | 3 +- .../accumulo/test/functional/MaxOpenIT.java | 3 +- .../test/functional/MetadataMaxFiles.java | 3 +- .../test/functional/MetadataSplitIT.java| 3 +- .../accumulo/test/functional/RestartIT.java | 3 +- .../test/functional/RestartStressIT.java| 5 +- .../accumulo/test/functional/RowDeleteIT.java | 3 +- .../test/functional/ScanSessionTimeOutIT.java | 3 +- .../functional/SimpleBalancerFairnessIT.java| 3 +- .../accumulo/test/functional/SplitIT.java | 3 +- .../apache/accumulo/test/functional/SslIT.java | 5 +- .../test/functional/SslWithClientAuthIT.java| 5 +- .../accumulo/test/functional/TabletIT.java | 3 +- .../test/functional/WriteAheadLogIT.java| 5 +- .../test/functional/ZookeeperRestartIT.java | 3 +- 61 files changed, 1317 insertions(+), 558 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/core/src/main/java/org/apache/accumulo/core/conf/Property.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/08f0b9ac/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java -- diff --cc core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java index b19dc7d,b2741c0..926e42e --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java +++
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91eb87c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91eb87c4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91eb87c4 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 91eb87c4891f7b04cb8777a171a4d9654463f1ee Parents: dd7e593 6c91e34 Author: Eric Newton eric.new...@gmail.com Authored: Tue Feb 18 15:07:56 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Feb 18 15:07:56 2014 -0500 -- .../accumulo/test/DeleteTableDuringSplitIT.java | 125 --- .../functional/DeleteTableDuringSplitIT.java| 86 + 2 files changed, 86 insertions(+), 125 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8681f07c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8681f07c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8681f07c Branch: refs/heads/master Commit: 8681f07ca1cf02d99cdc865e2a4f5915d7537d60 Parents: 25948e6 f90202f Author: Eric Newton eric.new...@gmail.com Authored: Tue Jan 28 14:22:27 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Jan 28 14:22:27 2014 -0500 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b8f2b72c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8f2b72c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b8f2b72c Branch: refs/heads/master Commit: b8f2b72c219d1af3db412704a845c6293d928ac7 Parents: 21f09f4 3f92e01 Author: John Vines vi...@apache.org Authored: Tue Jan 28 18:17:06 2014 -0500 Committer: John Vines vi...@apache.org Committed: Tue Jan 28 18:17:06 2014 -0500 -- .../main/java/org/apache/accumulo/tserver/TabletServer.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77568bc3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77568bc3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77568bc3 Branch: refs/heads/master Commit: 77568bc36c1219d7a13b1913f7a02d55f946b69f Parents: 217264f c35b70c Author: Eric Newton eric.new...@gmail.com Authored: Fri Jan 17 10:23:56 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Jan 17 10:23:56 2014 -0500 -- .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3f21e5d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f21e5d9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3f21e5d9 Branch: refs/heads/master Commit: 3f21e5d93b94ca8625c69d0c0ecb8a1da49c4891 Parents: 9338b52 d30a76f Author: Eric Newton eric.new...@gmail.com Authored: Thu Jan 16 10:41:58 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Jan 16 10:41:58 2014 -0500 -- .../java/org/apache/accumulo/core/file/BloomFilterLayer.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cffb74a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cffb74a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cffb74a Branch: refs/heads/master Commit: 4cffb74a5a558d6edad9408f0e4996cfb1de157d Parents: 08be60e 0ab78c6 Author: Eric Newton eric.new...@gmail.com Authored: Mon Jan 13 09:01:32 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Jan 13 09:01:32 2014 -0500 -- .../core/util/shell/commands/CreateTableCommand.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc10e22d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc10e22d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc10e22d Branch: refs/heads/master Commit: dc10e22dc4ea19874328513ca9859bd19e848216 Parents: c3d5c1f 77b4507 Author: Keith Turner ktur...@apache.org Authored: Thu Jan 9 16:34:51 2014 -0500 Committer: Keith Turner ktur...@apache.org Committed: Thu Jan 9 16:34:51 2014 -0500 -- .../minicluster/MiniAccumuloCluster.java| 4 +--- .../minicluster/MiniAccumuloConfig.java | 20 ++-- .../minicluster/MiniAccumuloClusterGCTest.java | 25 .../minicluster/MiniAccumuloClusterTest.java| 4 ++-- 4 files changed, 5 insertions(+), 48 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b547531 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b547531 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b547531 Branch: refs/heads/master Commit: 9b5475314fcdd15459422ef7d33c2abca4eb25cc Parents: 0c92a63 a55ee6e Author: Josh Elser els...@apache.org Authored: Wed Jan 8 22:04:43 2014 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Jan 8 22:04:43 2014 -0500 -- pom.xml| 2 +- proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b547531/pom.xml --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/86a26fe6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86a26fe6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/86a26fe6 Branch: refs/heads/master Commit: 86a26fe6716974fc046fec6a0324fe65c367c35c Parents: abb4f91 a573f96 Author: Eric Newton eric.new...@gmail.com Authored: Fri Jan 3 12:25:19 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Jan 3 12:25:19 2014 -0500 -- .../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d82aa229 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d82aa229 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d82aa229 Branch: refs/heads/master Commit: d82aa229ba16b1702f000908ffe00b93f3691154 Parents: 8b8c615 766eb22 Author: Josh Elser els...@apache.org Authored: Fri Jan 3 17:47:06 2014 -0500 Committer: Josh Elser els...@apache.org Committed: Fri Jan 3 17:47:06 2014 -0500 -- .../org/apache/accumulo/server/init/Initialize.java | 16 1 file changed, 16 insertions(+) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a88df142 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a88df142 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a88df142 Branch: refs/heads/master Commit: a88df142fe5aea09ab48275ebb24ddff13e8a529 Parents: d82aa22 a871d59 Author: Josh Elser els...@apache.org Authored: Fri Jan 3 18:28:34 2014 -0500 Committer: Josh Elser els...@apache.org Committed: Fri Jan 3 18:28:34 2014 -0500 -- .../1GB/native-standalone/accumulo-site.xml | 21 +- conf/examples/1GB/standalone/accumulo-site.xml | 21 +- .../2GB/native-standalone/accumulo-site.xml | 21 +- conf/examples/2GB/standalone/accumulo-site.xml | 21 +- .../3GB/native-standalone/accumulo-site.xml | 21 +- conf/examples/3GB/standalone/accumulo-site.xml | 21 +- .../512MB/native-standalone/accumulo-site.xml | 21 +- .../examples/512MB/standalone/accumulo-site.xml | 21 +- conf/examples/crypto/accumulo-site.xml | 23 ++-- conf/examples/vfs-classloader/accumulo-site.xml | 21 +- 10 files changed, 101 insertions(+), 111 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1bd9abcd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bd9abcd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1bd9abcd Branch: refs/heads/master Commit: 1bd9abcd47baede5669310d1c434a05605db7c72 Parents: 495d7ae 9524e81 Author: Josh Elser els...@apache.org Authored: Thu Jan 2 17:56:15 2014 -0500 Committer: Josh Elser els...@apache.org Committed: Thu Jan 2 17:56:15 2014 -0500 -- pom.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1bd9abcd/pom.xml --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8c84be2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8c84be2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8c84be2 Branch: refs/heads/master Commit: c8c84be29ddf8d108daa18992402c408fc01b547 Parents: 62e4375 99ad86d Author: Eric Newton eric.new...@gmail.com Authored: Thu Dec 12 11:20:41 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Dec 12 11:20:41 2013 -0500 -- .../org/apache/accumulo/core/data/Range.java| 58 +++- .../apache/accumulo/core/data/RangeTest.java| 58 2 files changed, 113 insertions(+), 3 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bec52b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bec52b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bec52b5 Branch: refs/heads/master Commit: 0bec52b51be05641144089dcc427644a511f658f Parents: 4832f90 352dc1b Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Dec 6 22:47:43 2013 -0500 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Dec 6 22:47:43 2013 -0500 -- core/pom.xml| 59 examples/simple/pom.xml | 41 +++--- fate/pom.xml| 3 - minicluster/pom.xml | 25 - .../apache/accumulo/minicluster/MemoryUnit.java | 14 ++--- .../minicluster/MiniAccumuloInstance.java | 4 +- .../minicluster/MiniAccumuloRunner.java | 48 .../minicluster/ProcessNotFoundException.java | 2 +- .../accumulo/minicluster/ProcessReference.java | 6 +- proxy/pom.xml | 28 -- server/extras/pom.xml | 19 +++ server/gc/pom.xml | 19 +++ server/master/pom.xml | 28 -- server/monitor/pom.xml | 29 -- server/tracer/pom.xml | 19 +++ server/tserver/pom.xml | 55 -- start/pom.xml | 12 ++-- test/pom.xml| 54 +- trace/pom.xml | 11 ++-- 19 files changed, 211 insertions(+), 265 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/core/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/examples/simple/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/fate/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/minicluster/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/proxy/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/extras/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/gc/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/master/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/monitor/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tracer/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tserver/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/start/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/test/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/trace/pom.xml --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf309e54 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf309e54 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf309e54 Branch: refs/heads/master Commit: cf309e544be6a8e412441b9616f08a85640e3ba8 Parents: ccec95b b5227cf Author: Josh Elser els...@apache.org Authored: Tue Dec 3 11:56:38 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Tue Dec 3 11:56:38 2013 -0500 -- README | 5 + 1 file changed, 5 insertions(+) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ccec95b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccec95b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ccec95b6 Branch: refs/heads/master Commit: ccec95b69cc40bb83627b24ec795b4898fe030ff Parents: c706289 890ee25 Author: Josh Elser els...@apache.org Authored: Mon Dec 2 17:54:20 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Mon Dec 2 17:54:20 2013 -0500 -- .../accumulo/server/fs/VolumeManagerImpl.java | 17 +++-- .../accumulo/tserver/log/MultiReaderTest.java | 2 -- 2 files changed, 11 insertions(+), 8 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/378a9f1d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/378a9f1d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/378a9f1d Branch: refs/heads/master Commit: 378a9f1d696b5456b4255bd23b7f601eed78d720 Parents: e677637 387fcfb Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:38:32 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:38:32 2013 -0500 -- .../apache/accumulo/test/CreateTestTable.java | 90 .../accumulo/test/functional/TabletIT.java | 63 -- 2 files changed, 55 insertions(+), 98 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eaa2f28d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eaa2f28d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eaa2f28d Branch: refs/heads/master Commit: eaa2f28d2dd54b04453973373f7c37980dedafa9 Parents: c3befc2 294bed9 Author: Josh Elser els...@apache.org Authored: Tue Nov 26 17:07:09 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Tue Nov 26 17:07:09 2013 -0500 -- test/system/continuous/README | 3 +- test/system/continuous/agitator.pl | 155 +--- 2 files changed, 85 insertions(+), 73 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff651a70 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff651a70 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff651a70 Branch: refs/heads/master Commit: ff651a70652d2e5add63da1de8993fdf401db133 Parents: ae6a5f4 fd652ca Author: Eric Newton eric.new...@gmail.com Authored: Mon Nov 25 15:25:31 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 15:25:31 2013 -0500 -- .../simple/client/RandomBatchScanner.java | 21 +-- .../mapreduce/bulk/BulkIngestExample.java | 2 +- .../simple/mapreduce/bulk/GenerateTestData.java | 2 +- .../accumulo/test/functional/ExamplesIT.java| 22 +++- 4 files changed, 25 insertions(+), 22 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19848636 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19848636 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/19848636 Branch: refs/heads/master Commit: 19848636f139e817cbd545fd2887fc60edfdae15 Parents: aac0b66 050e7e2 Author: Josh Elser els...@apache.org Authored: Wed Nov 13 10:42:11 2013 -0800 Committer: Josh Elser els...@apache.org Committed: Wed Nov 13 10:42:11 2013 -0800 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f82eeb29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f82eeb29 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f82eeb29 Branch: refs/heads/master Commit: f82eeb291e1bf3df904225febe12f092359d4d9b Parents: ac55104 fce4ee7 Author: Eric Newton eric.new...@gmail.com Authored: Wed Nov 13 13:58:28 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Wed Nov 13 13:58:28 2013 -0500 -- server/master/src/main/java/org/apache/accumulo/master/Master.java | 1 - 1 file changed, 1 deletion(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/209cc076 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/209cc076 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/209cc076 Branch: refs/heads/master Commit: 209cc076b46a5e7580ff3741697e32d35546e70c Parents: b71bc4d feb0f31 Author: Christopher Tubbs ctubb...@apache.org Authored: Wed Nov 13 20:18:30 2013 -0500 Committer: Christopher Tubbs ctubb...@apache.org Committed: Wed Nov 13 20:18:30 2013 -0500 -- .../apache/accumulo/core/cli/ClientOpts.java| 16 ++-- .../core/client/mock/MockConfiguration.java | 11 ++- .../core/conf/AccumuloConfiguration.java| 43 +-- .../accumulo/core/conf/ConfigurationCopy.java | 9 ++- .../core/conf/DefaultConfiguration.java | 26 +-- .../accumulo/core/conf/SiteConfiguration.java | 21 ++--- .../accumulo/core/iterators/IteratorUtil.java | 80 ++-- .../examples/simple/mapreduce/JobUtil.java | 4 +- .../server/conf/TableConfiguration.java | 35 - .../accumulo/server/conf/ZooConfiguration.java | 30 ++-- 10 files changed, 147 insertions(+), 128 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d690b1e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d690b1e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d690b1e Branch: refs/heads/master Commit: 4d690b1e0beaec2aeaa1e1c22f8861a68fa8fe39 Parents: c00ac62 c68066d Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Nov 8 17:26:08 2013 -0500 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Nov 8 17:26:08 2013 -0500 -- --
