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/a0567c56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a0567c56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a0567c56 Branch: refs/heads/master Commit: a0567c562a2a7161796cc89aa154191695097651 Parents: 6da318b 9bfef59 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Jan 2 14:46:56 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Jan 2 14:46:56 2014 -0500 ---------------------------------------------------------------------- .../examples/simple/reservations/ARS.java | 126 +++++++++---------- 1 file changed, 63 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
