You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/26 17:53:11 UTC

[6/8] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

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/99aa9a96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99aa9a96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99aa9a96

Branch: refs/heads/1.7
Commit: 99aa9a965d5f5d19cf4f0405a077b5fc957d2eec
Parents: af8d3bf b4f6e5e
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:43 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:43 2015 -0400

----------------------------------------------------------------------
 assemble/bin/accumulo                                        | 5 -----
 assemble/bin/stop-here.sh                                    | 2 +-
 .../java/org/apache/accumulo/server/init/Initialize.java     | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java    | 8 +++++---
 4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------