accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Mon, 16 Dec 2013 22:11:22 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/02add1dd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02add1dd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02add1dd

Branch: refs/heads/master
Commit: 02add1ddde25b98c65c79b4bc5255af87c140749
Parents: 80cf0a6 39b22d3
Author: John Vines <vines@apache.org>
Authored: Mon Dec 16 17:11:09 2013 -0500
Committer: John Vines <vines@apache.org>
Committed: Mon Dec 16 17:11:09 2013 -0500

----------------------------------------------------------------------
 .../core/client/admin/InstanceOperationsImpl.java         |  2 +-
 .../java/org/apache/accumulo/core/util/AddressUtil.java   | 10 +++++++++-
 .../org/apache/accumulo/core/util/ServerServices.java     |  2 +-
 .../org/apache/accumulo/server/master/LiveTServerSet.java |  2 +-
 .../accumulo/server/master/state/TServerInstance.java     |  4 ++--
 .../server/master/state/TabletStateChangeIterator.java    |  2 +-
 .../main/java/org/apache/accumulo/server/util/Admin.java  |  3 ++-
 .../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java  |  2 +-
 .../apache/accumulo/monitor/servlets/MasterServlet.java   |  6 +++---
 .../test/randomwalk/concurrent/StopTabletServer.java      |  2 +-
 10 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------



Mime
View raw message