Updated Branches: refs/heads/0.2-dev 3aa45c60e -> cf5a06edc refs/heads/0.2-dev-removing-old-thrift 0996b6a1c -> 1f6a34ccc
Merge branch '0.2-dev' of https://git-wip-us.apache.org/repos/asf/incubator-blur into 0.2-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/cf5a06ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/cf5a06ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/cf5a06ed Branch: refs/heads/0.2-dev Commit: cf5a06edcfefcb3f440bc22271b303c52ed3a058 Parents: b0893e1 3aa45c6 Author: Aaron McCurry <[email protected]> Authored: Thu Nov 8 22:09:54 2012 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Nov 8 22:09:54 2012 -0500 ---------------------------------------------------------------------- interface/Blur.thrift | 53 +- interface/gen-html/Blur.html | 75 +- interface/gen-html/index.html | 18 +- .../org/apache/blur/thrift/generated/Document.java | 12 + .../org/apache/blur/thrift/generated/Field.java | 40 + .../org/apache/blur/thrift/generated/Lucene.java | 8047 --------------- .../blur/thrift/generated/MutateOptions.java | 48 + .../apache/blur/thrift/generated/ShardServer.java | 8047 +++++++++++++++ .../org/apache/blur/thrift/generated/Term.java | 24 + .../blur/thrift/generated/UpdatePackage.java | 24 + interface/gen-perl/Blur/Lucene.pm | 2065 ---- interface/gen-perl/Blur/ShardServer.pm | 2065 ++++ interface/gen-rb/blur_types.rb | 13 + interface/gen-rb/lucene.rb | 514 - interface/gen-rb/shard_server.rb | 514 + .../org/apache/blur/thrift/BlurShardServer.java | 2 +- .../apache/blur/thrift/ThriftBlurShardServer.java | 7 +- .../blur/testsuite/AddDocumentsLuceneApiTable.java | 2 +- .../blur/testsuite/SearchLuceneApiTable.java | 2 +- .../org/apache/blur/thrift/generated/Document.java | 12 + .../org/apache/blur/thrift/generated/Field.java | 40 + .../org/apache/blur/thrift/generated/Lucene.java | 8047 --------------- .../blur/thrift/generated/MutateOptions.java | 48 + .../apache/blur/thrift/generated/ShardServer.java | 8047 +++++++++++++++ .../org/apache/blur/thrift/generated/Term.java | 24 + .../blur/thrift/generated/UpdatePackage.java | 24 + src/pom.xml | 181 +- 27 files changed, 19202 insertions(+), 18793 deletions(-) ----------------------------------------------------------------------
