incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [8/8] git commit: Merge branch 'apache-blur-0.2' into console-v2
Date Thu, 29 May 2014 21:16:18 GMT
Merge branch 'apache-blur-0.2' into console-v2


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

Branch: refs/heads/console-v2
Commit: 7b6d5e8dcca2f0886018e04c78614f6a872a3d50
Parents: 22ac33f af000ff
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu May 29 17:16:04 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu May 29 17:16:04 2014 -0400

----------------------------------------------------------------------
 .../apache/blur/manager/BlurQueryChecker.java   | 12 ++--
 .../org/apache/blur/thrift/BlurShardServer.java |  5 --
 .../blur/thrift/ThriftBlurControllerServer.java | 14 ++--
 .../blur/thrift/ThriftBlurShardServer.java      | 14 ++--
 .../java/org/apache/blur/utils/BlurUtil.java    | 27 ++++++--
 .../org/apache/blur/gui/HttpJettyServer.java    | 69 +++++++++----------
 blur-gui/src/main/webapp/WEB-INF/web.xml        |  2 +-
 .../mapreduce/lib/GenericBlurRecordWriter.java  | 43 ++++++------
 .../apache/blur/mapreduce/lib/NullCounter.java  | 72 ++++++++++++++++++++
 .../blur/lucene/search/FacetExecutor.java       |  3 +-
 .../org/apache/blur/utils/BlurConstants.java    |  1 +
 .../notices/commons-el-1.0.jar.NOTICE           |  0
 .../notices/commons-el-1.0.jar.src              |  0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |  0
 .../notices/commons-httpclient-3.0.1.jar.src    |  0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |  7 --
 .../concurrentlinkedhashmap-lru-1.3.2.jar.src   |  7 ++
 .../notices/generate-notice.sh                  |  4 +-
 .../notices/guava-14.0.jar.NOTICE               |  0
 .../notices/guava-14.0.jar.src                  |  0
 .../jackson-annotations-2.1.1.jar.NOTICE        |  0
 .../notices/jackson-annotations-2.1.1.jar.src   |  0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |  0
 .../notices/jackson-core-2.1.1.jar.src          |  0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |  0
 .../notices/jackson-databind-2.1.1.jar.src      |  0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |  0
 .../notices/jakarta-regexp-1.4.jar.src          |  0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   | 18 -----
 .../notices/jasper-compiler-5.5.12.jar.src      | 18 +++++
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    | 18 -----
 .../notices/jasper-runtime-5.5.12.jar.src       | 18 +++++
 .../notices/jets3t-0.6.1.jar.NOTICE             | 18 -----
 .../notices/jets3t-0.6.1.jar.src                | 18 +++++
 .../notices/jetty-6.1.26.jar.NOTICE             | 36 ----------
 .../notices/jetty-6.1.26.jar.src                | 36 ++++++++++
 .../notices/jetty-util-6.1.26.jar.NOTICE        | 36 ----------
 .../notices/jetty-util-6.1.26.jar.src           | 36 ++++++++++
 .../notices/metrics-core-2.2.0.jar.NOTICE       | 11 ---
 .../notices/metrics-core-2.2.0.jar.src          | 11 +++
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    | 11 ---
 .../notices/metrics-ganglia-2.2.0.jar.src       | 11 +++
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   | 11 ---
 .../notices/metrics-graphite-2.2.0.jar.src      | 11 +++
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    | 11 ---
 .../notices/metrics-servlet-2.2.0.jar.src       | 11 +++
 .../notices/oro-2.0.8.jar.NOTICE                |  0
 .../resources-hadoop1/notices/oro-2.0.8.jar.src |  0
 .../notices/spatial4j-0.3.jar.NOTICE            |  0
 .../notices/spatial4j-0.3.jar.src               |  0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |  5 --
 .../notices/zookeeper-3.4.5.jar.src             |  5 ++
 .../notices/commons-el-1.0.jar.NOTICE           |  0
 .../notices/commons-el-1.0.jar.src              |  0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |  0
 .../notices/commons-httpclient-3.0.1.jar.src    |  0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |  7 --
 .../concurrentlinkedhashmap-lru-1.3.2.jar.src   |  7 ++
 .../notices/generate-notice.sh                  |  4 +-
 .../notices/guava-14.0.jar.NOTICE               |  0
 .../notices/guava-14.0.jar.src                  |  0
 .../jackson-annotations-2.1.1.jar.NOTICE        |  0
 .../notices/jackson-annotations-2.1.1.jar.src   |  0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |  0
 .../notices/jackson-core-2.1.1.jar.src          |  0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |  0
 .../notices/jackson-databind-2.1.1.jar.src      |  0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |  0
 .../notices/jakarta-regexp-1.4.jar.src          |  0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   | 18 -----
 .../notices/jasper-compiler-5.5.12.jar.src      | 18 +++++
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    | 18 -----
 .../notices/jasper-runtime-5.5.12.jar.src       | 18 +++++
 .../notices/jets3t-0.6.1.jar.NOTICE             | 18 -----
 .../notices/jets3t-0.6.1.jar.src                | 18 +++++
 .../notices/jetty-6.1.26.jar.NOTICE             | 36 ----------
 .../notices/jetty-6.1.26.jar.src                | 36 ++++++++++
 .../notices/jetty-util-6.1.26.jar.NOTICE        | 36 ----------
 .../notices/jetty-util-6.1.26.jar.src           | 36 ++++++++++
 .../notices/metrics-core-2.2.0.jar.NOTICE       | 11 ---
 .../notices/metrics-core-2.2.0.jar.src          | 11 +++
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    | 11 ---
 .../notices/metrics-ganglia-2.2.0.jar.src       | 11 +++
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   | 11 ---
 .../notices/metrics-graphite-2.2.0.jar.src      | 11 +++
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    | 11 ---
 .../notices/metrics-servlet-2.2.0.jar.src       | 11 +++
 .../notices/oro-2.0.8.jar.NOTICE                |  0
 .../resources-hadoop2/notices/oro-2.0.8.jar.src |  0
 .../notices/snappy-java-1.0.4.1.jar.NOTICE      | 16 -----
 .../notices/snappy-java-1.0.4.1.jar.src         | 16 +++++
 .../notices/spatial4j-0.3.jar.NOTICE            |  0
 .../notices/spatial4j-0.3.jar.src               |  0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |  5 --
 .../notices/zookeeper-3.4.5.jar.src             |  5 ++
 pom.xml                                         |  1 +
 96 files changed, 554 insertions(+), 477 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7b6d5e8d/pom.xml
----------------------------------------------------------------------


Mime
View raw message