accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/4] git commit: ACCUMULO-1639 Merge branch '1.5.1-SNAPSHOT'
Date Wed, 11 Sep 2013 02:42:04 GMT
ACCUMULO-1639 Merge branch '1.5.1-SNAPSHOT'

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


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

Branch: refs/heads/master
Commit: 4df06620171f155438cf1700a866cd42590cf108
Parents: 63c5d64 4737324
Author: Josh Elser <elserj@apache.org>
Authored: Tue Sep 10 22:41:46 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Sep 10 22:41:46 2013 -0400

----------------------------------------------------------------------
 .../core/iterators/user/ColumnSliceFilter.java  | 115 ++++++++
 .../iterators/user/ColumnSliceFilterTest.java   | 277 +++++++++++++++++++
 2 files changed, 392 insertions(+)
----------------------------------------------------------------------



Mime
View raw message