incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [57/58] git commit: Merge branch 'master' into new-blur-console
Date Tue, 08 Oct 2013 18:00:05 GMT
Merge branch 'master' into new-blur-console


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7b205b38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7b205b38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7b205b38

Branch: refs/heads/blur-console-v2
Commit: 7b205b38cf15a8333e16316013727d37800bde7d
Parents: de5eb33 89e47b7
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Fri Oct 4 14:08:32 2013 -0400
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Fri Oct 4 14:08:32 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/server/TableContext.java    |  79 ++++++++++++--
 .../blur/thrift/ThriftBlurShardServer.java      |   3 +
 .../java/org/apache/blur/utils/BlurUtil.java    |  12 ++-
 .../apache/blur/server/TableContextTest.java    | 102 +++++++++++++++++++
 .../java/org/apache/blur/server/TestType.java   |  28 +++++
 .../org/apache/blur/thrift/generated/Blur.java  |  48 ++++-----
 .../blur/thrift/generated/BlurQueryStatus.java  |   8 +-
 .../blur/thrift/generated/BlurResults.java      |   8 +-
 .../blur/thrift/generated/ColumnDefinition.java |   8 +-
 .../apache/blur/thrift/generated/Metric.java    |  24 ++---
 .../apache/blur/thrift/generated/Schema.java    |  16 +--
 .../apache/blur/thrift/generated/Selector.java  |   8 +-
 .../blur/thrift/generated/TableDescriptor.java  |  28 ++---
 .../org/apache/blur/utils/BlurConstants.java    |   4 +-
 .../src/main/scripts/interface/Blur.thrift      |   3 +-
 .../main/scripts/interface/gen-html/Blur.html   |   3 +-
 .../org/apache/blur/thrift/generated/Blur.java  |  48 ++++-----
 .../blur/thrift/generated/BlurQueryStatus.java  |   8 +-
 .../blur/thrift/generated/BlurResults.java      |   8 +-
 .../blur/thrift/generated/ColumnDefinition.java |   8 +-
 .../apache/blur/thrift/generated/Metric.java    |  24 ++---
 .../apache/blur/thrift/generated/Schema.java    |  16 +--
 .../apache/blur/thrift/generated/Selector.java  |   8 +-
 .../blur/thrift/generated/TableDescriptor.java  |  28 ++---
 .../main/scripts/interface/gen-rb/blur_types.rb |   3 +-
 .../src/main/scripts/interface/genAndReplace.sh |  10 +-
 docs/Blur.html                                  |  19 +++-
 pom.xml                                         |   2 +-
 28 files changed, 404 insertions(+), 160 deletions(-)
----------------------------------------------------------------------



Mime
View raw message