Skip to content

Commit

Permalink
Merge branch 'release/UV_v2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Marcek committed Jul 9, 2015
2 parents 0db8820 + 8837402 commit 65b3eca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion unifiedviews-webapp-mysql/src/deb/usr/share/unifiedviews/tomcat/bin/setenv.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CATALINA_OPTS=" -DconfigFileLocation=/etc/unifiedviews/frontend-config.properties -Xmx512M"
JAVA_OPTS="-Djava.awt.headless=true"
CATALINA_OPTS=" -DconfigFileLocation=/etc/unifiedviews/frontend-config.properties"
3 changes: 2 additions & 1 deletion unifiedviews-webapp-pgsql/src/deb/usr/share/unifiedviews/tomcat/bin/setenv.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CATALINA_OPTS=" -DconfigFileLocation=/etc/unifiedviews/frontend-config.properties -Xmx512M"
JAVA_OPTS="-Djava.awt.headless=true"
CATALINA_OPTS=" -DconfigFileLocation=/etc/unifiedviews/frontend-config.properties"

0 comments on commit 65b3eca

Please sign in to comment.