Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80b21b8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80b21b8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80b21b8d Branch: refs/heads/master Commit: 80b21b8d5938a45cd50eaddfc9549bdae70d02e4 Parents: 964b6f6 49aa56b Author: Eric Newton <[email protected]> Authored: Fri Sep 20 12:22:25 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Fri Sep 20 12:22:25 2013 -0400 ---------------------------------------------------------------------- core/pom.xml | 15 ++ .../org/apache/accumulo/core/conf/Property.java | 3 +- .../apache/accumulo/core/util/shell/Shell.java | 51 +++-- .../core/util/shell/ShellOptionsJC.java | 14 ++ .../core/util/shell/ShellSetInstanceTest.java | 221 +++++++++++++++++++ .../chapters/table_design.tex | 8 +- .../server/tabletserver/TabletServer.java | 3 +- 7 files changed, 294 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
