Merge branch 'blur-120'
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/07f0756f Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/07f0756f Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/07f0756f Branch: refs/heads/0.2.0-newtypesystem Commit: 07f0756fd7ecd571aabfe51b15584f52d768fb16 Parents: 8920000 26ea6f1 Author: Aaron McCurry <[email protected]> Authored: Wed Aug 7 21:34:08 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Aug 7 21:34:08 2013 -0400 ---------------------------------------------------------------------- .../blur/manager/status/MergerQueryStatus.java | 8 ++ .../blur/manager/status/QueryStatusManager.java | 1 + .../org/apache/blur/thrift/BlurShardServer.java | 6 +- .../blur/thrift/generated/BlurQueryStatus.java | 128 ++++++++++++++++++- .../apache/blur/thrift/generated/Status.java | 68 ++++++++++ .../src/main/scripts/interface/Blur.thrift | 13 ++ .../main/scripts/interface/gen-html/Blur.html | 10 ++ .../main/scripts/interface/gen-html/index.html | 1 + .../blur/thrift/generated/BlurQueryStatus.java | 128 ++++++++++++++++++- .../apache/blur/thrift/generated/Status.java | 68 ++++++++++ .../main/scripts/interface/gen-js/Blur_types.js | 20 +++ .../scripts/interface/gen-perl/Blur/Types.pm | 20 ++- .../main/scripts/interface/gen-rb/blur_types.rb | 15 ++- 13 files changed, 475 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
