incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [04/21] git commit: Merge branch 'master' into blur-0.2.4-parcel
Date Tue, 11 Aug 2015 18:01:37 GMT
Merge branch 'master' into blur-0.2.4-parcel

Conflicts:
	blur-shell/src/main/java/org/apache/blur/shell/QueryCommandHelper.java


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

Branch: refs/heads/master
Commit: d854beda2a80353959855661b21ddf225b20e27b
Parents: b20bf0d 1c7aba2
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Jun 24 08:17:07 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Jun 24 08:17:07 2015 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java     | 15 ++++++++++++---
 .../apache/blur/analysis/FieldTypeDefinition.java | 18 +++++++++++++++++-
 .../type/AclDiscoverFieldTypeDefinition.java      |  4 ++++
 .../analysis/type/AclReadFieldTypeDefinition.java |  4 ++++
 .../analysis/type/DateFieldTypeDefinition.java    |  8 ++++++++
 .../analysis/type/DoubleFieldTypeDefinition.java  |  9 +++++++++
 .../apache/blur/analysis/type/ExampleType.java    |  6 ++++++
 .../type/FieldLessFieldTypeDefinition.java        |  6 ++++++
 .../analysis/type/FloatFieldTypeDefinition.java   |  9 +++++++++
 .../analysis/type/IntFieldTypeDefinition.java     |  9 +++++++++
 .../analysis/type/LongFieldTypeDefinition.java    |  9 +++++++++
 .../analysis/type/StoredFieldTypeDefinition.java  |  6 ++++++
 .../analysis/type/StringFieldTypeDefinition.java  |  5 +++++
 .../analysis/type/TextFieldTypeDefinition.java    |  6 ++++++
 .../spatial/BaseSpatialFieldTypeDefinition.java   |  7 +++++--
 ...ialPointVectorStrategyFieldTypeDefinition.java |  7 +++++++
 ...sivePrefixTreeStrategyFieldTypeDefinition.java |  7 ++++++-
 ...ueryPrefixTreeStrategyFieldTypeDefinition.java |  8 +++++++-
 .../java/org/apache/blur/shell/QueryCommand.java  | 11 +++--------
 .../org/apache/blur/shell/QueryCommandHelper.java |  8 ++++----
 20 files changed, 142 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d854beda/blur-shell/src/main/java/org/apache/blur/shell/QueryCommandHelper.java
----------------------------------------------------------------------


Mime
View raw message