Commit Graph

7 Commits

Author SHA1 Message Date
Rohit Yadav 53c0ab856a CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
	plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/NeutronRestApi.java
	plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java
	systemvm/scripts/config_ssl.sh
	utils/src/com/cloud/utils/nio/NioClient.java
	utils/src/com/cloud/utils/rest/RESTServiceConnector.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2015-01-21 18:24:54 +05:30
Jayapal 192c706164 CLOUDSTACK-6328: added license header and removed white space
(cherry picked from commit d093a8a7b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:28 +05:30
Saurav Lahiri 650464eda0 CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 96b1c6bf3c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:13 +05:30
Koushik Das 4809d91c51 CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
(cherry picked from commit 1ae02009b5)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:06:14 -08:00
Rajesh Battala 35d8b2f88d CLOUDSTACK-5559 Add CIFS support in ssvm-check script 2013-12-22 20:24:15 +05:30
Hugo Trippaers 71dc43ebb0 Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00
Hugo Trippaers 6c26104282 Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00