Updated Branches: refs/heads/network-refactor 93a89b159 -> c339c4cec
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/c339c4ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c339c4ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c339c4ce Branch: refs/heads/network-refactor Commit: c339c4cecabdf953f481ef3a74bb5efa91efe081 Parents: 93a89b1 Author: Prachi Damle <[email protected]> Authored: Wed Jan 30 16:21:36 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Wed Jan 30 16:21:36 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/c339c4ce/client/tomcatconf/server-ssl.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in index 3ea43dc..3695f62 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"
