This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 2019a5c [AMBARI-22836] remove unused stackfeatures and add new one
for NiFi (#177)
2019a5c is described below
commit 2019a5c0d824c73167535ac7091fc1af765c4826
Author: Yolanda Davis <[email protected]>
AuthorDate: Fri Feb 2 01:57:51 2018 -0500
[AMBARI-22836] remove unused stackfeatures and add new one for NiFi (#177)
---
.../HDP/2.0.6/properties/stack_features.json | 22 ++++++----------------
.../2.6/configs/default_kafka_plaintext.json | 4 ++--
.../2.6/configs/default_kafka_plaintextsasl.json | 4 ++--
.../2.6/configs/default_kafka_sasl_plaintext.json | 4 ++--
.../stacks/2.6/configs/default_kafka_sasl_ssl.json | 4 ++--
.../stacks/2.6/configs/secure_kafka_sasl_ssl.json | 4 ++--
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
index 6d622ec..2c330a0 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
@@ -434,30 +434,20 @@
"min_version": "2.6.3.0"
},
{
- "name": "registry_allowed_resources_support",
- "description": "Registry allowed resources",
- "min_version": "2.6.3.0"
- },
- {
- "name": "registry_rewriteuri_filter_support",
- "description": "Registry RewriteUri servlet filter",
- "min_version": "2.6.3.0"
- },
- {
- "name": "sam_storage_core_in_registry",
- "description": "Storage core module moved to registry",
- "min_version": "2.6.3.0"
- },
- {
"name": "kafka_extended_sasl_support",
"description": "Support SASL PLAIN and GSSAPI",
- "min_version": "2.6.5.0"
+ "min_version": "2.6.99.99"
},
{
"name": "oozie_extjs_included",
"description": "ExtJS is included in the repository and automatically
installed by Ambari",
"min_version": "2.2.0.0",
"max_version": "2.6.0.0"
+ },
+ {
+ "name": "nifi_encrypted_authorizers_config",
+ "description": "Support encrypted authorizers.xml configuration for
version 3.1 onwards",
+ "min_version": "2.6.5.0"
}
]
}
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
index aee3d1b..3159058 100644
---
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
+++
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
@@ -10,7 +10,7 @@
"ambari_db_rca_password": "mapred",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
"jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.6.5.0",
+ "stack_version": "2.6.99.99",
"stack_name": "HDP",
"ambari_db_rca_driver": "org.postgresql.Driver",
"jdk_name": "jdk-7u67-linux-x64.tar.gz",
@@ -24,7 +24,7 @@
"serviceName": "SLIDER",
"role": "SLIDER",
"commandParams": {
- "version": "2.6.5.0-1235",
+ "version": "2.6.99.99-1235",
"command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
index 1847d4b..3941ff8 100644
---
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
+++
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
@@ -10,7 +10,7 @@
"ambari_db_rca_password": "mapred",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
"jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.6.5.0",
+ "stack_version": "2.6.99.99",
"stack_name": "HDP",
"ambari_db_rca_driver": "org.postgresql.Driver",
"jdk_name": "jdk-7u67-linux-x64.tar.gz",
@@ -24,7 +24,7 @@
"serviceName": "SLIDER",
"role": "SLIDER",
"commandParams": {
- "version": "2.6.5.0-1235",
+ "version": "2.6.99.99-1235",
"command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
index 40218f1..675c0b9 100644
---
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
+++
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
@@ -10,7 +10,7 @@
"ambari_db_rca_password": "mapred",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
"jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.6.5.0",
+ "stack_version": "2.6.99.99",
"stack_name": "HDP",
"ambari_db_rca_driver": "org.postgresql.Driver",
"jdk_name": "jdk-7u67-linux-x64.tar.gz",
@@ -24,7 +24,7 @@
"serviceName": "SLIDER",
"role": "SLIDER",
"commandParams": {
- "version": "2.6.5.0-1235",
+ "version": "2.6.99.99-1235",
"command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
index 8f81c71..ac263a4 100644
---
a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
+++
b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
@@ -10,7 +10,7 @@
"ambari_db_rca_password": "mapred",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
"jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.6.5.0",
+ "stack_version": "2.6.99.99",
"stack_name": "HDP",
"ambari_db_rca_driver": "org.postgresql.Driver",
"jdk_name": "jdk-7u67-linux-x64.tar.gz",
@@ -24,7 +24,7 @@
"serviceName": "SLIDER",
"role": "SLIDER",
"commandParams": {
- "version": "2.6.5.0-1235",
+ "version": "2.6.99.99-1235",
"command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
b/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
index cb5b257..82b3f11 100644
---
a/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
+++
b/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
@@ -10,7 +10,7 @@
"ambari_db_rca_password": "mapred",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
"jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.6.5.0",
+ "stack_version": "2.6.99.99",
"stack_name": "HDP",
"ambari_db_rca_driver": "org.postgresql.Driver",
"jdk_name": "jdk-7u67-linux-x64.tar.gz",
@@ -24,7 +24,7 @@
"serviceName": "SLIDER",
"role": "SLIDER",
"commandParams": {
- "version": "2.6.5.0-1235",
+ "version": "2.6.99.99-1235",
"command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
--
To stop receiving notification emails like this one, please contact
[email protected].