You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/20 14:06:38 UTC
[1/3] ambari git commit: AMBARI-22274. use different names for
superset and druid metadata storage config sections. (nishantmonu51)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-20859 d6b271e6b -> 698465d5a
AMBARI-22274. use different names for superset and druid metadata storage config sections. (nishantmonu51)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ac8e534
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ac8e534
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ac8e534
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 9ac8e534d2a4bbac672ecfed447b6213aa9954ca
Parents: e76b563
Author: Nishant <ni...@gmail.com>
Authored: Fri Oct 20 01:32:14 2017 +0530
Committer: Nishant <ni...@gmail.com>
Committed: Fri Oct 20 01:44:03 2017 +0530
----------------------------------------------------------------------
.../DRUID/0.10.1/themes/theme.json | 26 ++++++++++----------
.../SUPERSET/0.15.0/themes/theme.json | 22 ++++++++---------
2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ac8e534/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json
index 7033e19..46a953a 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json
@@ -7,24 +7,24 @@
"name": "default",
"tabs": [
{
- "name": "metadata_storage",
- "display-name": "META DATA STORAGE CONFIG",
+ "name": "druid_metadata_storage",
+ "display-name": "DRUID META DATA STORAGE CONFIG",
"layout": {
- "tab-columns": "",
+ "tab-columns": "1",
"tab-rows": "1",
"sections": [
{
- "name": "section-metadata-storage",
+ "name": "section-druid-metadata-storage",
"display-name": "",
"row-index": "0",
"column-index": "0",
- "row-span": "2",
+ "row-span": "1",
"column-span": "1",
"section-columns": "1",
"section-rows": "1",
"subsections": [
{
- "name": "subsection-metadata-storage-row1-col1",
+ "name": "subsection-druid-metadata-storage-row1-col1",
"display-name": "DRUID META DATA STORAGE",
"row-index": "0",
"column-index": "0",
@@ -44,31 +44,31 @@
"configs": [
{
"config": "druid-common/database_name",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/druid.metadata.storage.type",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/druid.metadata.storage.connector.user",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/druid.metadata.storage.connector.password",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/metastore_hostname",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/druid.metadata.storage.connector.port",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
},
{
"config": "druid-common/druid.metadata.storage.connector.connectURI",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-druid-metadata-storage-row1-col1"
}
]
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ac8e534/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json
index a2c6001..6f1cc17 100644
--- a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json
+++ b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json
@@ -7,14 +7,14 @@
"name": "default",
"tabs": [
{
- "name": "metadata_storage",
- "display-name": "META DATA STORAGE CONFIG",
+ "name": "superset_metadata_storage",
+ "display-name": "SUPERSET META DATA STORAGE CONFIG",
"layout": {
"tab-columns": "1",
"tab-rows": "1",
"sections": [
{
- "name": "section-metadata-storage",
+ "name": "section-superset-metadata-storage",
"display-name": "",
"row-index": "0",
"column-index": "0",
@@ -24,7 +24,7 @@
"section-rows": "1",
"subsections": [
{
- "name": "subsection-metadata-storage-row1-col1",
+ "name": "subsection-superset-metadata-storage-row1-col1",
"display-name": "SUPERSET META DATA STORAGE",
"row-index": "0",
"column-index": "0",
@@ -44,31 +44,31 @@
"configs": [
{
"config": "superset/SUPERSET_DATABASE_NAME",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SUPERSET_DATABASE_TYPE",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SUPERSET_DATABASE_USER",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SUPERSET_DATABASE_PASSWORD",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SUPERSET_DATABASE_HOSTNAME",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SUPERSET_DATABASE_PORT",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
},
{
"config": "superset/SECRET_KEY",
- "subsection-name": "subsection-metadata-storage-row1-col1"
+ "subsection-name": "subsection-superset-metadata-storage-row1-col1"
}
]
},
[2/3] ambari git commit: AMBARI-22276 Ambari trunk builds failing in
TestAmbariServer (dsen)
Posted by rl...@apache.org.
AMBARI-22276 Ambari trunk builds failing in TestAmbariServer (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edd5ce9b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edd5ce9b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edd5ce9b
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: edd5ce9b78ee5d4d369936a33e4f0ca75474f1c9
Parents: 9ac8e53
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Oct 20 16:26:16 2017 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Oct 20 16:26:16 2017 +0300
----------------------------------------------------------------------
ambari-server/src/test/python/TestAmbariServer.py | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/edd5ce9b/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index d064b00..66df2d8 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -8000,10 +8000,6 @@ class TestAmbariServer(TestCase):
@patch("ambari_server.serverConfiguration.get_ambari_properties")
@patch("ambari_server.serverConfiguration.get_ambari_version")
def test_check_database_name_property(self, get_ambari_version_mock, get_ambari_properties_mock, write_property_mock):
- parser = OptionParser()
- parser.add_option('--database', default=None, help="Database to use embedded|oracle|mysql|mssql|postgres", dest="dbms")
- args = parser.parse_args()
-
# negative case
get_ambari_properties_mock.return_value = {JDBC_DATABASE_NAME_PROPERTY: ""}
try:
[3/3] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Posted by rl...@apache.org.
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/698465d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/698465d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/698465d5
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 698465d5af12f2c4586d8ece3b92947f2dbf34e6
Parents: d6b271e edd5ce9
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Oct 20 10:06:31 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Oct 20 10:06:31 2017 -0400
----------------------------------------------------------------------
.../DRUID/0.10.1/themes/theme.json | 26 ++++++++++----------
.../SUPERSET/0.15.0/themes/theme.json | 22 ++++++++---------
.../src/test/python/TestAmbariServer.py | 4 ---
3 files changed, 24 insertions(+), 28 deletions(-)
----------------------------------------------------------------------