accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [7/7] accumulo git commit: Merge branch '1.7'
Date Tue, 02 Jun 2015 21:57:12 GMT
Merge branch '1.7'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java


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

Branch: refs/heads/master
Commit: 0b7d8eeae0a66e6b3e5401a171b458d1679b8f9c
Parents: fba068b 5bd993b
Author: Josh Elser <elserj@apache.org>
Authored: Tue Jun 2 17:40:11 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Jun 2 17:40:11 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/proxy/Proxy.java   |   8 +-
 .../accumulo/harness/SharedMiniClusterIT.java   |   6 +-
 .../accumulo/test/AccumuloOutputFormatIT.java   |   6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java |   8 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 485 +++++++++++++++----
 .../accumulo/test/proxy/TestProxyClient.java    |  21 +
 6 files changed, 437 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b7d8eea/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------


Mime
View raw message