Merge branch 'master' into mazz/integration-assembly

hawkular · Feb 18, 2015 · d8feaa9 · d8feaa9
2 parents 2956920 + 08a1c20
commit d8feaa9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ui/console/pom.xml b/ui/console/pom.xml
@@ -120,14 +120,11 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <webResources>
-            <resource>
-              <directory>target/dist</directory>
-              <filtering>false</filtering>
-            </resource>
             <resource>
               <directory>target</directory>
               <includes>
                 <include>libs/**</include>
+                <include>dist/**</include>
               </includes>
               <filtering>false</filtering>
             </resource>

diff --git a/ui/console/resources/img/hawkular.png → ...rc/main/webapp/resources/img/hawkular.png b/ui/console/resources/img/hawkular.png → ...rc/main/webapp/resources/img/hawkular.png