accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/4] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Date Tue, 23 Dec 2014 00:30:53 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 62868b8e0 -> 92551204e
  refs/heads/master 87194852f -> 9c019c1cb


Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62868b8e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62868b8e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62868b8e

Branch: refs/heads/master
Commit: 62868b8e0132a65ef90a2e1fa331e37ded197dd5
Parents: 00d758d c5427e1
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Mon Dec 22 14:35:01 2014 -0500
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Mon Dec 22 14:35:01 2014 -0500

----------------------------------------------------------------------
 README                                          |  20 ++-
 .../client/mapreduce/AbstractInputFormat.java   |   2 +-
 .../mapreduce/lib/impl/ConfiguratorBase.java    |   1 +
 .../accumulo/core/security/SecurityUtil.java    |  80 -----------
 .../apache/accumulo/core/util/shell/Shell.java  |  12 +-
 .../core/util/shell/ShellOptionsJC.java         |   1 +
 .../util/shell/commands/AddSplitsCommand.java   |   2 +
 .../core/util/shell/ShellConfigTest.java        |   4 +-
 .../accumulo_user_manual.tex                    |   1 +
 .../chapters/administration.tex                 |  24 +++-
 .../chapters/implementation.tex                 |  76 ++++++++++
 .../simple/mapreduce/TeraSortIngest.java        |   5 +-
 .../minicluster/MiniAccumuloRunner.java         |   1 +
 .../impl/MiniAccumuloClusterImpl.java           |   8 +-
 .../MiniAccumuloClusterStartStopTest.java       |  26 ++--
 pom.xml                                         |   4 +-
 .../accumulo/server/fs/VolumeManagerImpl.java   |  12 +-
 .../accumulo/server/security/SecurityUtil.java  |  83 +++++++++++
 .../server/util/AddFilesWithMissingEntries.java | 137 -------------------
 .../server/fs/VolumeManagerImplTest.java        |  23 ++++
 .../accumulo/master/TabletGroupWatcher.java     |  28 +++-
 .../accumulo/master/tableOps/BulkImport.java    |   6 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  |   8 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  12 +-
 .../vfs/AccumuloVFSClassLoaderTest.java         |  80 +++++++++++
 .../test/stress/random/package-info.java        |   3 +-
 .../test/functional/MetadataMaxFilesIT.java     |   2 +
 27 files changed, 386 insertions(+), 275 deletions(-)
----------------------------------------------------------------------



Mime
View raw message