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/b95467db Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b95467db Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b95467db Branch: refs/heads/master Commit: b95467db0928f72e4f2bf091199be89dc21dc1be Parents: 28337a4 26563dd Author: Aaron McCurry <[email protected]> Authored: Thu Jan 29 20:53:01 2015 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Jan 29 20:53:01 2015 -0500 ---------------------------------------------------------------------- blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java | 2 +- .../main/java/org/apache/blur/concurrent/ThreadWatcher.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
