You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/06/04 19:41:11 UTC
svn commit: r1489532 - in /incubator/ambari/trunk/ambari-web:
app/data/secure_configs.js app/data/service_configs.js
app/models/service.js test/utils/host_progress_popup_test.js
Author: yusaku
Date: Tue Jun 4 17:40:56 2013
New Revision: 1489532
URL: http://svn.apache.org/r1489532
Log:
AMBARI-2273. Display "Hive" rather than "Hive/HCat" as the service display name. (Oleg Nechiporenko via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
incubator/ambari/trunk/ambari-web/app/data/service_configs.js
incubator/ambari/trunk/ambari-web/app/models/service.js
incubator/ambari/trunk/ambari-web/test/utils/host_progress_popup_test.js
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_configs.js?rev=1489532&r1=1489531&r2=1489532&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_configs.js Tue Jun 4 17:40:56 2013
@@ -60,7 +60,7 @@ module.exports = [
{
serviceName: 'HIVE',
- displayName: 'Hive/HCat',
+ displayName: 'Hive',
filename: 'hive-site',
configCategories: [
App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore'})
Modified: incubator/ambari/trunk/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/service_configs.js?rev=1489532&r1=1489531&r2=1489532&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/service_configs.js Tue Jun 4 17:40:56 2013
@@ -86,7 +86,7 @@ module.exports = [
{
serviceName: 'HIVE',
- displayName: 'Hive/HCat',
+ displayName: 'Hive',
filename: 'hive-site',
configCategories: [
App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}),
Modified: incubator/ambari/trunk/ambari-web/app/models/service.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service.js?rev=1489532&r1=1489531&r2=1489532&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/service.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/service.js Tue Jun 4 17:40:56 2013
@@ -154,7 +154,7 @@ App.Service = DS.Model.extend({
case 'oozie':
return 'Oozie';
case 'hive':
- return 'Hive/HCat';
+ return 'Hive';
case 'hcatalog':
return 'HCat';
case 'zookeeper':
Modified: incubator/ambari/trunk/ambari-web/test/utils/host_progress_popup_test.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/test/utils/host_progress_popup_test.js?rev=1489532&r1=1489531&r2=1489532&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/test/utils/host_progress_popup_test.js (original)
+++ incubator/ambari/trunk/ambari-web/test/utils/host_progress_popup_test.js Tue Jun 4 17:40:56 2013
@@ -50,7 +50,7 @@ describe('App.HostPopup', function () {
isRunning: false
},
{
- displayName: "Start service Hive/HCat",
+ displayName: "Start service Hive",
hosts: [
{
logTasks: [
@@ -65,7 +65,7 @@ describe('App.HostPopup', function () {
],
name: "ip-10-12-123-90.ec2.internal",
publicName: "ip-10-12-123-90.ec2.internal",
- serviceName: "Start service Hive/HCat"
+ serviceName: "Start service Hive"
},
{
logTasks: [
@@ -88,7 +88,7 @@ describe('App.HostPopup', function () {
],
name: "ip-10-33-7-23.ec2.internal",
publicName: "ip-10-33-7-23.ec2.internal",
- serviceName: "Start service Hive/HCat"
+ serviceName: "Start service Hive"
}
],
isRunning: false