You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/01/31 02:06:23 UTC
[2/3] git commit: refs/heads/ipv6 - Removing the merge conflict
statements from git.
Removing the merge conflict statements from git.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c5b2a655
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c5b2a655
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c5b2a655
Branch: refs/heads/ipv6
Commit: c5b2a6559888822e22ff9137e293f7e0e4a820a9
Parents: 25ae2e4
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Jan 30 16:21:36 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jan 30 17:04:57 2013 -0800
----------------------------------------------------------------------
client/tomcatconf/server-ssl.xml.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c5b2a655/client/tomcatconf/server-ssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
index 6e8bf52..5d68f1d 100755
--- a/client/tomcatconf/server-ssl.xml.in
+++ b/client/tomcatconf/server-ssl.xml.in
@@ -197,7 +197,6 @@
<!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 -->
<Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
->>>>>>> bcfd64a... CS-15373: Awsapi port change to 7080.
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreType="JKS"