Repository: ambari Updated Branches: refs/heads/trunk e02969e17 -> 424cf6580
AMBARI-20158 - Host filter is missing for admin user after upgrading to ambari 2.4.2 or above <fix1> (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/424cf658 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/424cf658 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/424cf658 Branch: refs/heads/trunk Commit: 424cf658089646672ac0559ab045887f35a98205 Parents: e02969e Author: Richard Zang <rz...@apache.org> Authored: Fri Feb 24 14:07:58 2017 -0800 Committer: Richard Zang <rz...@apache.org> Committed: Fri Feb 24 14:07:58 2017 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/experimental.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/424cf658/ambari-web/app/controllers/experimental.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/experimental.js b/ambari-web/app/controllers/experimental.js index 25f7add..da8f39d 100644 --- a/ambari-web/app/controllers/experimental.js +++ b/ambari-web/app/controllers/experimental.js @@ -35,7 +35,7 @@ App.ExperimentalController = Em.Controller.extend(App.UserPref, { getUserPrefSuccessCallback: function (response, request, data) { if (response) { - App.set('supports', $.merge(response, App.get('supports'))); + App.set('supports', $.extend(App.get('supports'), response)); } },