etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,611 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

1003 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
Abhinandan Prateek 969bbb02a9 CLOUDSTACK-8164: Look for all host to avoid NPE 
(cherry picked from commit d8def3dc0b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
 2015-01-19 11:32:06 +05:30
Rohit Yadav dc97372d6f engine/storage: add NPE check, break if parent snapshot is null 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c06ca09b54)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:21:07 +05:30
Edison Su ebf9897293 CLOUDSTACK-7301, CLOUDSTACK-7947: double check if parent snapshot is removed or not 
when creating new snapshot, check if parent snapshot is removed or not

Reviewed-by: Min
(cherry picked from commit bd79965329)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
 2014-12-18 18:26:24 +05:30
Rohit Yadav 5519095a29 CLOUDSTACK-8070: during 4.3.1 to 4.3.2 upgrade encrypt config that are hidden 
In case there is an encryption key/password is provided the value, specifically
for router.ram.size will be encrypted otherwise it will remain plain text.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-12 20:33:16 +05:30
Rohit Yadav f47e32ec5f
cloudstack: change version to 4.3.2 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-11 19:08:36 +05:30
Nitin Mehta e5761cc85f CLOUDSTACK-5997: Template state changes side affects 
(cherry picked from commit 0e2e6995b7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/template/HypervisorTemplateAdapter.java

This makes setup/db/db/schema-421to430.sql same as in master branch. The
change is table view related and does not affect db at all. Making it same
as the version on master for sanity purposes.
 2014-12-02 15:16:11 +05:30
Alena Prokharchyk 90d6c01e40 CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network 
(cherry picked from commit 4dcc5671d1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/components-api/src/com/cloud/network/IpAddressManager.java
	server/src/com/cloud/network/IpAddressManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
 2014-12-02 15:03:52 +05:30
Hiroki Ohashi 0e0827f07c CLOUDSTACK-7412: Can't create proper template from VM on S3 secondary storage environment 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-11-27 17:03:25 +05:30
Sanjay Tripathi 77446d2716 CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another. 
(cherry picked from commit 624139d8ef)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 18:23:04 +05:30
Min Chen 2534b54853 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in 
VolumeDataStoreVO.
(cherry picked from commit 672bb353be)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 18:15:05 +05:30
Min Chen 88ec08439d CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql 
(cherry picked from commit cd8af6a3e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 18:14:53 +05:30
Murali Reddy 816eb63e97 CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of 
cleanup the rules then destroy

fix adds a provision to specify if cleanup is needed on network on
shutdown. VR is marked as to not to require network rules clean up on
network shutdown as the VR is destroyed and recreated.

ran the simulator tests that test network life cycle

(cherry picked from commit 67876b215e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 19:46:40 +05:30
Min Chen 1cc58b1a6f CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed 
operation.

(cherry picked from commit 1e20600eca)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 19:13:50 +05:30
Jayapal 1e475892d5 CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network 
(cherry picked from commit 709bf074de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
 2014-11-25 18:28:20 +05:30
Rohit Yadav 6d31aca25c CLOUDSTACK-6075: Increase the ram size for router service offering 
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 14:08:25 +05:30
Rohit Yadav 2a72afdc48 Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"" 
The revert was an error, sorry about that.
  - Rohit

This reverts commit 0aba9654f8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-21 18:04:33 +05:30
Likitha Shetty 59ce63918e CLOUDSTACK-7415. Host remains in Alert after vCenter restart. 
Management server PingTask should update PingMap entry for an agent only if it is already present in the Management Server's PingMap.

(cherry picked from commit 8ce6eba549)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-21 16:20:48 +05:30
Rohit Yadav 0aba9654f8 Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path" 
This reverts commit c3c3bab41a.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 20:35:45 +05:30
Rohit Yadav c3c3bab41a Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path 
This reverts commit e6d00bcc66.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 14:04:43 +05:30
Rohit Yadav e6d00bcc66 Revert "Updating pom.xml version numbers for release 4.3.2-SNAPSHOT" 
This reverts commit 063bb8f5b4.
 2014-11-18 16:04:33 +05:30
Daan Hoogland 52cf8af08e whitespace 2014-10-09 10:55:03 +02:00
Daan Hoogland 1a1190eb1d CLOUDSTACK-7674 throw an exception when encountered 2014-10-07 08:05:27 +02:00
Sebastien Goasguen 063bb8f5b4 Updating pom.xml version numbers for release 4.3.2-SNAPSHOT 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-16 09:16:47 -04:00
Bharat Kumar 57c69a8ba0 CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-10 13:24:06 +02:00
Loic Lambiel c1bf7eeeee CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-05 17:28:33 +02:00
Sebastien Goasguen 41c0eaa14d Updating pom.xml version numbers for release 4.3.1 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 16:47:57 +02:00
Rohit Yadav f5483eeeab schema: fix upgrade paths in the upgrade map of DatabaseUpgradeChecker 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-01 13:52:25 +02:00
Sebastien Goasguen a654894dbd Updating pom.xml version numbers for release 4.3.1-SNAPSHOT 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-08-25 09:16:27 -04:00
Edison Su 720315b8d1 CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool 2014-07-16 16:30:15 -07:00
Rajani Karuturi 85bed5fa2b COVERITY: Fixed issues reported by coverity NPEs, unwritten field access and self assignment 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-07-02 16:07:06 +02:00
Rajani Karuturi 44c8e1f67f COVERITY: Fixed Resource leak (RESOURCE_LEAK) 11. 
overwrite_var: Overwriting "pstmt" in "pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ldap_configuration`(hostname, port) VALUES(?,?)")" leaks the resource that "pstmt" refers to.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-07-02 16:05:09 +02:00
Daan Hoogland 51f145b564 datamigration for vlan uris 2014-06-30 15:15:11 +02:00
Olivier Lemasle caa102c23d CLOUDSTACK-7006: Restore template ID in ROOT volume usages 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-06-30 15:10:17 +02:00
Min Chen 1772fcffc3 CLOUDSTACK-6478: Failed to download Template when having 3 SSVM's in one 2014-06-17 14:56:55 +02:00
Edison Su f304df0be9 Merge branch '4.3-forward' into 4.3 2014-06-04 16:25:13 -07:00
Harikrishna Patnala 5ccde5de93 CLOUDSTACK-5976: Typo in "ssh_keypairs" table's foreign key constraints 
on the Upgraded Setup
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
 2014-05-05 20:39:33 +02:00
Devdeep Singh d417ce0d70 CLOUDSTACK-5743. The link generated for downlading a volume or a template was giving a 
permission error on hyper-v. Fixed the path with which a softlink is created for a
downloaded volume or template. Also addressed the issue at other places where the path
field wasn't set correctly when a volume was migrated or a template was created from
a volume.
 2014-03-18 11:49:14 +05:30
Harikrishna Patnala e11bbe7651 CLOUDSTACK-6211: Xenserver - HA - SSVM fails to start due to running out of management Ip ranges when testing host down scenarios 
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 15bf144f1a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-17 16:18:49 -07:00
Harikrishna Patnala 15bf144f1a CLOUDSTACK-6211: Xenserver - HA - SSVM fails to start due to running out of management Ip ranges when testing host down scenarios 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-03-13 11:02:02 +05:30
Daan Hoogland 34435173a7 CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars 
(cherry picked from commit 454cac448d)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-12 11:02:56 -07:00
Daan Hoogland 454cac448d CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars 2014-03-12 17:01:38 +01:00
John Kinsella ec4db7bbff CLOUDSTACK-6204: Removing realhostip.com dependency 
For more info, see https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes

Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394399081 -0700
(cherry picked from commit 2fe7aeea23)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-10 12:55:41 -07:00
John Kinsella 2fe7aeea23 CLOUDSTACK-6204: Removing realhostip.com dependency 
For more info, see https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes

Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394399081 -0700
 2014-03-09 14:04:41 -07:00
Saksham Srivastava 7fb2b8c68e CLOUDSTACK-6151: Local data disk with tag goes to the wrong local storage pool 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-03-07 01:08:00 +07:00
Alena Prokharchyk eb61f8146d CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic 2014-03-07 01:07:59 +07:00
Alena Prokharchyk e0e13434b9 CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic 
Conflicts:
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
 2014-03-05 13:35:43 -08:00
Alena Prokharchyk 2457a92599 CLOUDSTACK-6184: for userVm/ServiceOffering/StoragePool details set display=true by default in the VO objects 
(cherry picked from commit 531a4ecc45)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-04 23:42:09 -08:00
Koushik Das 360b7e3b29 CLOUDSTACK-6124: During MS maintenance unfinished work items are not cleaned up resulting in them getting repeated for every subsequent maintenance 
Updating the op_it_work table entry appropriately in db once the unfinished work item is completed.
(cherry picked from commit c6a8659ac2)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-04 23:37:42 -08:00
Alena Prokharchyk 531a4ecc45 CLOUDSTACK-6184: for userVm/ServiceOffering/StoragePool details set display=true by default in the VO objects 2014-02-27 10:47:38 -08:00