incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Date Wed, 11 Sep 2013 00:10:10 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur


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

Branch: refs/heads/master
Commit: 5923b8e90b21daa6df690f3efe7b501578669b1f
Parents: f51a8e8 c16371d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Sep 10 20:09:46 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Sep 10 20:09:46 2013 -0400

----------------------------------------------------------------------
 LICENSE                                         |   35 +-
 .../org/apache/blur/manager/IndexManager.java   |    3 +
 .../blur/manager/results/PeekableIterator.java  |    3 +
 .../org/apache/blur/server/Configurable.java    |    4 +
 .../org/apache/blur/utils/ClassNameFilter.java  |    4 +
 .../java/org/apache/blur/utils/Converter.java   |    4 +
 .../org/apache/blur/utils/CreateGarbage.java    |   16 +
 .../apache/blur/utils/IterableConverter.java    |    3 +
 .../apache/blur/utils/IteratorConverter.java    |    4 +-
 .../org/apache/blur/utils/MemoryReporter.java   |   16 +
 .../org/apache/blur/utils/ReaderBlurRecord.java |    4 +
 .../org/apache/blur/thrift/BlurClusterTest.java |   11 +-
 blur-gui/src/main/webapp/WEB-INF/web.xml        |   17 +
 blur-gui/src/main/webapp/index.html             |   18 +
 blur-gui/src/main/webapp/js/d3.v2.js            |   28 +
 blur-gui/src/main/webapp/js/d3.v2.min.js        |   28 +
 blur-gui/src/main/webapp/js/jquery-1.9.1.min.js |   22 +
 blur-gui/src/main/webapp/style.css              |   16 +
 blur-gui/src/main/webapp/tableList.html         |   18 +
 blur-gui/src/main/webapp/test.html              |   18 +
 .../java/org/apache/blur/jdbc/QueryData.java    |    4 +
 .../apache/blur/jdbc/util/NotImplemented.java   |    4 +
 .../apache/blur/mapreduce/lib/GetCounter.java   |    4 +
 .../blur/mapreduce/lib/CsvBlurDriverTest.java   |   16 +
 .../test/resources/input-data/short.simple.txt  | 1000 ------------------
 .../analysis/AnalyzerNotFoundException.java     |    4 +
 .../analysis/type/spatial/ShapeReadWriter.java  |   16 +
 .../apache/blur/lucene/search/SuperParser.java  |   16 +
 .../blur/lucene/search/SuperParserTest.java     |   16 +
 .../org/apache/blur/shell/top.properties        |   15 +
 .../blur/lucene/warmup/ThrottledIndexInput.java |  240 +++--
 .../blur/store/blockcache/BlockCacheKey.java    |    4 +
 .../org/apache/blur/store/blockcache/Cache.java |    4 +
 .../thrift_0_9_0/ProcessFunction.java           |   19 +-
 .../thirdparty/thrift_0_9_0/TBaseProcessor.java |   18 +
 .../thrift_0_9_0/server/Invocation.java         |   18 +
 .../thrift_0_9_0/server/TServlet.java           |   18 +
 .../main/java/org/apache/blur/FindJavaHome.java |    3 +
 .../src/main/java/org/apache/blur/log/Log.java  |    4 +
 .../java/org/apache/blur/log/LogFactory.java    |    4 +
 .../apache/blur/metrics/MetricsConstants.java   |    4 +
 .../org/apache/blur/metrics/ReporterSetup.java  |    4 +
 .../org/apache/blur/utils/BlurIterator.java     |    3 +
 .../resources/org/apache/blur/doc/footer.html   |   16 +
 contrib/blur-console/blur-admin/script/rails    |   21 +
 distribution/src/assemble/bin.xml               |   19 +-
 distribution/src/assemble/src.xml               |    7 +-
 docs/resources/css/bs-docs.css                  |    9 +
 docs/resources/js/docs.js                       |    5 +
 docs/resources/js/jquery-2.0.3.min.js           |   23 +
 docs/resources/js/respond.min.js                |   23 +
 pom.xml                                         |   47 +-
 52 files changed, 748 insertions(+), 1132 deletions(-)
----------------------------------------------------------------------



Mime
View raw message