Author: yusaku
Date: Wed Jan 30 23:58:04 2013
New Revision: 1440738
URL: http://svn.apache.org/viewvc?rev=1440738&view=rev
Log:
AMBARI-1300. Service status / host component status can get stuck in the green
blinking state if stop fails - no further operation can be performed. (srimanth
via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/mappers/server_data_mapper.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440738&r1=1440737&r2=1440738&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jan 30 23:58:04 2013
@@ -186,10 +186,15 @@ Trunk (unreleased changes):
AMBARI-1270. Add predicate objects for checking empty resource category.
(tbeerbower)
- AMBARI - 1286. Set version number property in gsInstaller cluster resource
provider. (tbeerbower)
+ AMBARI - 1286. Set version number property in gsInstaller cluster resource
+ provider. (tbeerbower)
BUG FIXES
+ AMBARI-1300. Service status / host component status can get stuck in the
+ green blinking state if stop fails - no further operation can be performed.
+ (srimanth via yusaku)
+
AMBARI-1297. Edit User: if "old password" is not specified and "new
password" is specified, password update silently fails. (Jaimin Jetly via
yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/mappers/server_data_mapper.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/mappers/server_data_mapper.js?rev=1440738&r1=1440737&r2=1440738&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/mappers/server_data_mapper.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/mappers/server_data_mapper.js Wed Jan
30 23:58:04 2013
@@ -114,15 +114,14 @@ App.QuickDataMapper = App.ServerDataMapp
},
calculateState: function (json) {
- var stateEqual = (json.desired_status != json.work_status);
- if (stateEqual) {
- if (json.desired_status == 'STARTED' && json.work_status == 'INSTALLED')
{
- json.work_status = 'STARTING';
- } else if (json.desired_status == 'INSTALLED' && json.work_status ==
'STARTED') {
- json.work_status = 'STOPPING';
- }
- }
-
+// var stateEqual = (json.desired_status != json.work_status);
+// if (stateEqual) {
+// if (json.desired_status == 'STARTED' && json.work_status ==
'INSTALLED') {
+// json.work_status = 'STARTING';
+// } else if (json.desired_status == 'INSTALLED' && json.work_status ==
'STARTED') {
+// json.work_status = 'STOPPING';
+// }
+// }
return json;
}
});
