accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [12/50] [abbrv] git commit: Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Date Fri, 09 May 2014 15:28:50 GMT
Merge remote-tracking branch 'origin/master' into ACCUMULO-378


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

Branch: refs/heads/ACCUMULO-378
Commit: 23ea6d1095f7b3348c7f64b8357a852bef5be9eb
Parents: 274c185 1dae029
Author: Josh Elser <elserj@apache.org>
Authored: Fri May 2 16:34:24 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri May 2 16:34:24 2014 -0400

----------------------------------------------------------------------
 CHANGES                                         |  914 +---------
 README                                          |   18 +
 conf/examples/crypto/README                     |   23 +
 conf/examples/crypto/readme.txt                 |    5 -
 .../core/client/admin/ActiveCompaction.java     |   79 +-
 .../accumulo/core/client/admin/ActiveScan.java  |  112 +-
 .../client/admin/InstanceOperationsImpl.java    |  215 ---
 .../client/admin/NamespaceOperationsHelper.java |  214 ---
 .../client/admin/NamespaceOperationsImpl.java   |  254 ---
 .../client/admin/SecurityOperationsImpl.java    |  353 ----
 .../core/client/admin/TableOperations.java      |   15 +-
 .../client/admin/TableOperationsHelper.java     |  204 ---
 .../core/client/admin/TableOperationsImpl.java  | 1610 ------------------
 .../core/client/impl/ActiveCompactionImpl.java  |  109 ++
 .../core/client/impl/ActiveScanImpl.java        |  146 ++
 .../core/client/impl/ConnectorImpl.java         |    4 -
 .../client/impl/InstanceOperationsImpl.java     |  213 +++
 .../client/impl/NamespaceOperationsHelper.java  |  214 +++
 .../client/impl/NamespaceOperationsImpl.java    |  250 +++
 .../client/impl/SecurityOperationsImpl.java     |  351 ++++
 .../core/client/impl/TableOperationsHelper.java |  205 +++
 .../core/client/impl/TableOperationsImpl.java   | 1606 +++++++++++++++++
 .../client/mock/MockInstanceOperations.java     |   27 +-
 .../client/mock/MockNamespaceOperations.java    |    4 +-
 .../client/mock/MockSecurityOperations.java     |    2 +-
 .../core/client/mock/MockTableOperations.java   |    8 +-
 .../core/client/mock/MockTabletLocator.java     |   70 -
 .../client/mock/impl/MockTabletLocator.java     |   70 +
 .../constraints/DefaultKeySizeConstraint.java   |    6 +
 .../client/admin/TableOperationsHelperTest.java |  295 ----
 .../client/impl/TableOperationsHelperTest.java  |  305 ++++
 .../client/mock/MockTableOperationsTest.java    |   57 +
 .../common/state_diagrams/HDFS_WAL_states.odg   |  Bin 15864 -> 0 bytes
 .../common/state_diagrams/HDFS_WAL_states.pdf   |  Bin 26256 -> 0 bytes
 .../common/state_diagrams/tablet_states.odg     |  Bin 30540 -> 0 bytes
 .../common/state_diagrams/tablet_states.pdf     |  Bin 38759 -> 0 bytes
 .../mapreduce/lib/impl/InputConfigurator.java   |    2 +-
 .../apache/accumulo/cluster/AccumuloConfig.java |    5 +
 pom.xml                                         |   13 +-
 .../server/security/SecurityOperation.java      |    2 +-
 .../accumulo/master/FateServiceHandler.java     |    2 +-
 .../accumulo/master/tableOps/ImportTable.java   |    2 +-
 .../accumulo/shell/commands/HistoryCommand.java |   31 +-
 .../apache/accumulo/shell/mock/MockShell.java   |    8 +-
 .../shell/command/HistoryCommandTest.java       |   90 +
 test/compat/japi-compliance/README              |   24 +-
 .../japi-compliance/japi-accumulo-1.5.xml       |    1 -
 .../japi-compliance/japi-accumulo-1.6.xml       |    3 +-
 .../accumulo/test/TestMultiTableIngest.java     |    4 +
 .../test/functional/BackupMasterIT.java         |    2 +-
 .../test/functional/HalfDeadTServerIT.java      |   15 +-
 .../accumulo/test/functional/ReadWriteIT.java   |    9 +-
 .../accumulo/test/randomwalk/FrameworkTest.java |   48 +-
 test/system/continuous/ScaleTest.odp            |  Bin 21160 -> 0 bytes
 54 files changed, 3854 insertions(+), 4365 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/23ea6d10/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
----------------------------------------------------------------------


Mime
View raw message