incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: refs/heads/master - Removing the merge conflict statements from git.
Date Thu, 31 Jan 2013 00:31:23 GMT
Updated Branches:
  refs/heads/master 85aa3a997 -> 397b5b582


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/397b5b58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/397b5b58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/397b5b58

Branch: refs/heads/master
Commit: 397b5b582949f83422dce73162488acd1efeb490
Parents: 85aa3a9
Author: Prachi Damle <prachi@cloud.com>
Authored: Wed Jan 30 16:21:36 2013 -0800
Committer: Prachi Damle <prachi@cloud.com>
Committed: Wed Jan 30 16:30: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/397b5b58/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"


Mime
View raw message