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 2013/09/11 23:00:37 UTC

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

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


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: f9efaf19f4e5d7da345fdc1b906fec1e4ec59248
Parents: 4b98fac 789c920
Author: Eric Newton <er...@gmail.com>
Authored: Wed Sep 11 17:00:46 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Sep 11 17:00:46 2013 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/server/master/Master.java | 1 +
 .../org/apache/accumulo/server/tabletserver/TabletServer.java   | 1 +
 start/src/main/java/org/apache/accumulo/start/Main.java         | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------