accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [16/16] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 12 Dec 2013 16:25:38 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/403815f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/403815f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/403815f5

Branch: refs/heads/master
Commit: 403815f550627f953c4499acae491d331fbd736f
Parents: c8c84be 07cdc57
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Dec 12 11:25:35 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Dec 12 11:25:35 2013 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/client/Instance.java    | 10 +++++-----
 .../accumulo/core/client/ZooKeeperInstance.java      |  6 +++---
 .../accumulo/core/client/mock/MockInstance.java      |  2 +-
 .../core/client/impl/TabletLocatorImplTest.java      |  2 +-
 .../org/apache/accumulo/fate/zookeeper/ZooCache.java |  6 ++++--
 .../apache/accumulo/fate/zookeeper/ZooReader.java    | 15 ++++++++++++---
 .../accumulo/server/client/HdfsZooInstance.java      |  8 ++------
 7 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------



Mime
View raw message