svn commit: r1347309 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/fileCombinator.php

[vi...@apache.org]

Author: vikram
Date: Thu Jun  7 02:21:57 2012
New Revision: 1347309

URL: http://svn.apache.org/viewvc?rev=1347309&view=rev
Log:
AMBARI-485. Make Firebug debugger work again with fileCombinator.php (Contributed by Yusaku)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/fileCombinator.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347309&r1=1347308&r2=1347309&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 02:21:57 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-485. Make Firebug debugger work again with fileCombinator.php (Yusaku via Vikram)
+
   AMBARI-484. Reconfigure option for Nagios service does not work (Vikram)
 
   AMBARI-483. Start Making Responses From fileCombinator.php Suitably Cacheable (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/fileCombinator.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/fileCombinator.php?rev=1347309&r1=1347308&r2=1347309&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/fileCombinator.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/fileCombinator.php Thu Jun  7 02:21:57 2012
@@ -12,7 +12,7 @@ function deduceContentType ($fileToLoad)
   }
   elseif ($fileExtension == 'js' )
   {
-    $contentType = 'application/js';
+    $contentType = 'application/x-javascript';
   }
 
   return $contentType;