Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/289de4e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/289de4e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/289de4e9 Branch: refs/heads/master Commit: 289de4e9e72f7ec366be614d4339b9b1dcf2e62d Parents: 805e3c5 8e97ac2 Author: Aaron McCurry <amccu...@gmail.com> Authored: Wed Nov 18 10:11:32 2015 -0500 Committer: Aaron McCurry <amccu...@gmail.com> Committed: Wed Nov 18 10:11:32 2015 -0500 ---------------------------------------------------------------------- .../blur/thrift/BlurClusterTestSecurity.java | 50 ++++++++++++++++++++ .../security/index/SecureAtomicReader.java | 47 ++++++++++++++++++ .../index/SecureAtomicReaderTestBase.java | 32 ++++++++----- .../apache/blur/analysis/BaseFieldManager.java | 9 +++- .../type/ReadMaskFieldTypeDefinition.java | 7 ++- .../BaseReadMaskFieldTypeDefinitionTest.java | 4 +- 6 files changed, 129 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
