Revert "Merge branch 'trunk' of D:\incubator-ambari with conflicts."

This reverts commit e2fc2da45e6b392502dee2955096371cf21c3398.

ambari-web/karma.conf.js

@@ -102,7 +102,7 @@ module.exports = function(config) {
     },
 
     preprocessors: {
-      '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
+//      '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
       'app/templates/**/*.hbs': ['ember-precompiler-brunch', 'common-require'],
       'app!(assets)/**/!(karma_setup|tests).js': ['common-require'],
       'test/**/*.js': ['common-require']
@@ -117,7 +117,7 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
 //    reporters: ['progress', 'coverage'],
-    reporters: ['progress', 'coverage'],
+    reporters: ['progress'],
 
 
     // web server port

contrib/views/jobs/src/main/resources/ui/Gruntfile.js

@@ -181,18 +181,6 @@ module.exports = function (grunt) {
         dirs: ['<%= yeoman.dist %>']
       }
     },
-    imagemin: {
-      dist: {
-        files: [
-          {
-            expand: true,
-            cwd: '<%= yeoman.app %>/images',
-            src: '{,*/}*.{png,jpg,jpeg}',
-            dest: '<%= yeoman.dist %>/images'
-          }
-        ]
-      }
-    },
     svgmin: {
       dist: {
         files: [
@@ -272,22 +260,24 @@ module.exports = function (grunt) {
             cwd: '<%= yeoman.app %>',
             dest: '<%= yeoman.dist %>',
             src: [
-              '*.{ico,txt,php}',
+              '*.{ico,txt}',
               '.htaccess',
               'img/*',
               'styles/fonts/*',
               'scripts/assets/**/*'
             ]
-          }
-        ]
-      },
-      xampp: {
-        files: [
+          },
+          {
+            expand: true,
+            flatten: true,
+            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
+            dest: '<%= yeoman.dist %>/styles/images/'
+          },
           {
             expand: true,
-            flatten: false,
-            src: '<%= yeoman.dist %>/**/*',
-            dest: 'D:/xampp/htdocs/'
+            flatten: true,
+            src: '<%= yeoman.app %>/bower_components/font-awesome/font/*',
+            dest: '<%= yeoman.dist %>/font/'
           }
         ]
       }
@@ -301,7 +291,6 @@ module.exports = function (grunt) {
       ],
       dist: [
         'emberTemplates',
-        'imagemin',
         'svgmin',
         'htmlmin'
       ]
@@ -396,8 +385,7 @@ module.exports = function (grunt) {
     //'uglify',
     'copy:dist',
     //'rev',
-    'usemin',
-    'copy:xampp'
+    'usemin'
   ]);
 
   grunt.registerTask('default', [