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/041761ca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/041761ca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/041761ca Branch: refs/heads/master Commit: 041761ca6a25d273368e6201d41da7bffa2eefec Parents: eae953e d2caaa2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Apr 28 19:37:08 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Apr 28 19:37:08 2014 -0400 ---------------------------------------------------------------------- README | 18 ++++++++++++++ conf/examples/crypto/README | 23 ++++++++++++++++++ conf/examples/crypto/readme.txt | 5 ---- .../common/state_diagrams/HDFS_WAL_states.odg | Bin 15864 -> 0 bytes .../common/state_diagrams/HDFS_WAL_states.pdf | Bin 26256 -> 0 bytes .../common/state_diagrams/tablet_states.odg | Bin 30540 -> 0 bytes .../common/state_diagrams/tablet_states.pdf | Bin 38759 -> 0 bytes test/compat/japi-compliance/README | 24 +++++++++++++++---- test/system/continuous/ScaleTest.odp | Bin 21160 -> 0 bytes 9 files changed, 60 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
