ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject git commit: revert AMBARI-5732
Date Tue, 13 May 2014 02:02:04 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e3415f2dd -> f6ce8c67b


revert AMBARI-5732


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6ce8c67
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6ce8c67
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6ce8c67

Branch: refs/heads/trunk
Commit: f6ce8c67b7e1b3d7f3e394ef21da9c4c83884a57
Parents: e3415f2
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Mon May 12 22:01:16 2014 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Mon May 12 22:01:16 2014 -0400

----------------------------------------------------------------------
 ambari-server/pom.xml | 26 +++++++++++++-------------
 pom.xml               |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f6ce8c67/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 8997d83..ee7efe6 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -246,19 +246,19 @@
               </sources>
             </mapping>
             <!-- Put the contrib views in the view directory for deployment -->
-            <mapping>
-              <directory>/var/lib/ambari-server/resources/views</directory>
-              <sources>
-                <source>
-                  <location>
-                    ${project.basedir}/../contrib/views/target
-                  </location>
-                  <includes>
-                    <include>*.jar</include>
-                  </includes>
-                </source>
-              </sources>
-            </mapping>
+            <!--<mapping>-->
+              <!--<directory>/var/lib/ambari-server/resources/views</directory>-->
+              <!--<sources>-->
+                <!--<source>-->
+                  <!--<location>-->
+                    <!--${project.basedir}/../contrib/views/target-->
+                  <!--</location>-->
+                  <!--<includes>-->
+                    <!--<include>*.jar</include>-->
+                  <!--</includes>-->
+                <!--</source>-->
+              <!--</sources>-->
+            <!--</mapping>-->
             <mapping>
               <directory>${common_functions.install.dir}</directory>
               <sources>

http://git-wip-us.apache.org/repos/asf/ambari/blob/f6ce8c67/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f2af5f..92e87a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,7 +239,7 @@
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>
-        <module>contrib/views/</module>
+        <!--<module>contrib/views/</module>-->
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>
@@ -250,7 +250,7 @@
       <modules>
         <module>ambari-project</module>
         <module>ambari-views</module>
-        <module>contrib/views/</module>
+        <!--<module>contrib/views/</module>-->
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>


Mime
View raw message