accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [8/8] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 26 Dec 2013 21:48:18 GMT
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/8553b467
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8553b467
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8553b467

Branch: refs/heads/master
Commit: 8553b467851693f32fc2b8272ba17e301da96d84
Parents: 00bcb0c 9f59c00
Author: Josh Elser <elserj@apache.org>
Authored: Thu Dec 26 16:39:51 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Dec 26 16:39:51 2013 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/impl/Namespaces.java   |   6 ++
 .../accumulo/core/client/impl/Tables.java       |  10 +-
 .../apache/accumulo/server/init/Initialize.java |  24 +----
 .../accumulo/server/tables/TableManager.java    |  95 +++++--------------
 .../java/org/apache/accumulo/master/Master.java |  62 +++++-------
 .../master/tableOps/CreateNamespace.java        |   2 +-
 .../accumulo/master/tableOps/CreateTable.java   |   4 +-
 .../accumulo/master/tableOps/ImportTable.java   |   4 +-
 .../test/resources/ClassLoaderTestA/Test.jar    | Bin 748 -> 1570 bytes
 .../test/resources/ClassLoaderTestB/Test.jar    | Bin 748 -> 1572 bytes
 .../test/resources/ClassLoaderTestC/Test.jar    | Bin 748 -> 1571 bytes
 start/src/test/resources/HelloWorld2.jar        | Bin 575 -> 1483 bytes
 .../test/randomwalk/security/AlterTable.java    |  26 ++++-
 .../randomwalk/security/AlterTablePerm.java     |  45 ++++++---
 .../test/randomwalk/security/ChangePass.java    |   2 +-
 .../test/randomwalk/security/DropTable.java     |  21 +++-
 .../test/randomwalk/security/TableOp.java       |   3 +-
 .../test/randomwalk/security/Validate.java      |   4 +-
 test/src/test/resources/FooConstraint.jar       | Bin 1079 -> 2130 bytes
 test/src/test/resources/TestCombinerX.jar       | Bin 1525 -> 4335 bytes
 test/src/test/resources/TestCombinerY.jar       | Bin 1524 -> 4335 bytes
 21 files changed, 144 insertions(+), 164 deletions(-)
----------------------------------------------------------------------



Mime
View raw message