Repository: ambari Updated Branches: refs/heads/trunk 66d0b6e2c -> eadde3d58
AMBARI-12845. Alert Instances overriding issue(onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eadde3d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eadde3d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eadde3d5 Branch: refs/heads/trunk Commit: eadde3d5806b71eacc1540fc4e4dbec31412b3f7 Parents: 66d0b6e Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Aug 21 13:14:15 2015 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Aug 21 13:14:15 2015 +0300 ---------------------------------------------------------------------- .../test/controllers/main/alert_definitions_controller_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eadde3d5/ambari-web/test/controllers/main/alert_definitions_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/alert_definitions_controller_test.js b/ambari-web/test/controllers/main/alert_definitions_controller_test.js index 7d696f8..45bbd50 100644 --- a/ambari-web/test/controllers/main/alert_definitions_controller_test.js +++ b/ambari-web/test/controllers/main/alert_definitions_controller_test.js @@ -19,7 +19,7 @@ var App = require('app'); require('controllers/main/alert_definitions_controller'); -require('models/alert_definition'); +require('models/alerts/alert_definition'); var controller; describe('App.MainAlertDefinitionsController', function() {