Merge remote-tracking branch 'origin/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/1fba05a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1fba05a8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1fba05a8 Branch: refs/heads/master Commit: 1fba05a8e2b3f00a514fe551c847dc7c407455b8 Parents: 31a4356 42853c1 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Nov 20 18:34:04 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Nov 20 18:34:04 2013 -0500 ---------------------------------------------------------------------- .../src/main/resources/docs/examples/README.reservations | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------