You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2017/04/03 18:10:55 UTC

incubator-metron git commit: METRON-818 Ambari elasticsearch.properties template is missing topology.worker.childopts (justinleet) closes apache/incubator-metron#506

Repository: incubator-metron
Updated Branches:
  refs/heads/master a2452a25c -> a48d16e30


METRON-818 Ambari elasticsearch.properties template is missing topology.worker.childopts (justinleet) closes apache/incubator-metron#506


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

Branch: refs/heads/master
Commit: a48d16e30e2c6e89a49d430fa44db3dcc76447ae
Parents: a2452a2
Author: justinleet <ju...@gmail.com>
Authored: Mon Apr 3 14:09:45 2017 -0400
Committer: leet <le...@apache.org>
Committed: Mon Apr 3 14:09:45 2017 -0400

----------------------------------------------------------------------
 .../common-services/METRON/CURRENT/configuration/metron-env.xml    | 1 +
 metron-platform/metron-solr/src/main/config/solr.properties        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a48d16e3/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml
index 108e0ba..5598a96 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml
@@ -174,6 +174,7 @@
 ##### Storm #####
 indexing.workers=1
 indexing.executors=0
+topology.worker.childopts=
 ##### Kafka #####
 kafka.zk={{ zookeeper_quorum }}
 kafka.broker={{ kafka_brokers }}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a48d16e3/metron-platform/metron-solr/src/main/config/solr.properties
----------------------------------------------------------------------
diff --git a/metron-platform/metron-solr/src/main/config/solr.properties b/metron-platform/metron-solr/src/main/config/solr.properties
index 914832d..e20480d 100644
--- a/metron-platform/metron-solr/src/main/config/solr.properties
+++ b/metron-platform/metron-solr/src/main/config/solr.properties
@@ -17,7 +17,7 @@
 ##### Storm #####
 indexing.workers=1
 indexing.executors=0
-storm.auto.credentials=[]
+topology.worker.childopts=
 
 ##### Kafka #####