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/495d7aec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/495d7aec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/495d7aec Branch: refs/heads/master Commit: 495d7aec862678111f9f9e8065da51fbeaa7bf25 Parents: a0567c5 a56b766 Author: Eric Newton <[email protected]> Authored: Thu Jan 2 16:14:00 2014 -0500 Committer: Eric Newton <[email protected]> Committed: Thu Jan 2 16:14:00 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/examples/simple/reservations/ARS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
