You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/01 15:32:08 UTC
[06/10] storm git commit: Apply suggested changes in the pull
request: - Add Apache License to EsConfigTest; - Remove unused class;
- Change README
Apply suggested changes in the pull request:
- Add Apache License to EsConfigTest;
- Remove unused class;
- Change README
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1469c647
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1469c647
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1469c647
Branch: refs/heads/master
Commit: 1469c647799c2d9d644c40e078fc0d533f568699
Parents: 189ba57
Author: Alex Panov <al...@teradata.com>
Authored: Mon Aug 31 10:55:24 2015 +0200
Committer: Alex Panov <al...@teradata.com>
Committed: Mon Aug 31 10:55:24 2015 +0200
----------------------------------------------------------------------
external/storm-elasticsearch/README.md | 2 +-
.../storm/elasticsearch/common/EsConfigTest.java | 17 +++++++++++++++++
.../storm/elasticsearch/common/SniffSettings.java | 5 -----
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1469c647/external/storm-elasticsearch/README.md
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/README.md b/external/storm-elasticsearch/README.md
index 06a350c..2c52531 100644
--- a/external/storm-elasticsearch/README.md
+++ b/external/storm-elasticsearch/README.md
@@ -84,7 +84,7 @@ EsConfig esConfig = new EsConfig(clusterName, new String[]{"localhost:9300"}, ad
|--- |--- |---
|clusterName | Elasticsearch cluster name | String (required) |
|nodes | Elasticsearch nodes in a String array, each element should follow {host}:{port} pattern | String array (required) |
-|additionalParameters | Additional Elasticsearch configuration parameters | Map<String, String> (optional) |
+|additionalParameters | Additional Elasticsearch Transport Client configuration parameters | Map<String, String> (optional) |
## EsTupleMapper (org.apache.storm.elasticsearch.common.EsTupleMapper)
http://git-wip-us.apache.org/repos/asf/storm/blob/1469c647/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsConfigTest.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsConfigTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsConfigTest.java
index de28940..d50337f 100644
--- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsConfigTest.java
+++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsConfigTest.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.storm.elasticsearch.common;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/storm/blob/1469c647/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/SniffSettings.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/SniffSettings.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/SniffSettings.java
deleted file mode 100644
index e2666ee..0000000
--- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/SniffSettings.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.storm.elasticsearch.common;
-
-public final class SniffSettings {
-
-}