Merge branch 'master' into 0.2.0-newtypesystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/015c6811 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/015c6811 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/015c6811 Branch: refs/heads/master Commit: 015c6811a15f64e16ffda4b6ee3ac8b1155a5e61 Parents: d0b113e c448cca Author: Aaron McCurry <[email protected]> Authored: Mon Aug 12 07:46:40 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Aug 12 07:46:40 2013 -0400 ---------------------------------------------------------------------- .../blur/thrift/BlurControllerServer.java | 4 +- .../java/org/apache/blur/utils/BlurUtil.java | 81 ++++++++++++-------- .../org/apache/blur/utils/BlurUtilsTest.java | 36 ++++++++- .../org/apache/blur/shell/SelectorCommand.java | 8 +- .../apache/blur/thrift/generated/Selector.java | 42 +++++----- .../src/main/scripts/interface/Blur.thrift | 2 +- .../main/scripts/interface/gen-html/Blur.html | 2 +- .../apache/blur/thrift/generated/Selector.java | 42 +++++----- .../main/scripts/interface/gen-js/Blur_types.js | 12 +-- .../scripts/interface/gen-perl/Blur/Types.pm | 18 ++--- .../main/scripts/interface/gen-rb/blur_types.rb | 2 +- 11 files changed, 149 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/015c6811/distribution/src/main/scripts/interface/Blur.thrift ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/015c6811/distribution/src/main/scripts/interface/gen-html/Blur.html ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/015c6811/distribution/src/main/scripts/interface/gen-js/Blur_types.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/015c6811/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/015c6811/distribution/src/main/scripts/interface/gen-rb/blur_types.rb ----------------------------------------------------------------------
