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

7913 Commits

Author SHA1 Message Date
Min Chen eaaac81870 CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying 
all the tags of all resources.

(cherry picked from commit 5fa7801b20)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-21 18:52:28 +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
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
Syed 56d8b173a0 CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
(cherry picked from commit 8ea7902075)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 19:38:47 +05:30
Will Stevens 9258b8350e CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 
(cherry picked from commit 92d4a41a69)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/root_chain.crt
	server/test/resources/certs/root_chain.key
	server/test/resources/certs/rsa_ca_signed2.crt

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

Conflicts:
	server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/rsa_ca_signed.crt
	server/test/resources/certs/rsa_ca_signed.key
	server/test/resources/certs/rsa_self_signed.crt
	server/test/resources/certs/rsa_self_signed.key
	server/test/resources/certs/rsa_self_signed_with_pwd.crt
	server/test/resources/certs/rsa_self_signed_with_pwd.key
 2014-11-20 19:33:16 +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
Anshul Gangwar 14e048dada CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop. 
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-11-19 12:21:02 +01:00
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
Likitha Shetty e2fd4ef42c CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead 
(cherry picked from commit f4a96d4c85)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-14 17:32:41 +05:30
Sheng Yang 76f5f3048e CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network 
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-11-14 00:19:31 +05:30
Rohit Yadav c8929dfd10 CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updates entries in
vm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-10 18:12:37 +05:30
Kishan Kavala 7a86dc516d CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead 
(cherry picked from commit 63109a97b1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
 2014-10-09 10:56:10 +05:30
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
Rohit Yadav 885c02dbd8 CLOUDSTACK-7528: More verbose logging when sending alert fails 
When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-10 11:34:58 +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
Rajani Karuturi ab8fcd0b22 CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures. 
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 59bf355919)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-09-02 14:33:31 +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
Luis Henrique Okama e7ef14abae bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 23:57:49 +02:00
Saksham Srivastava 19b72d6cf5 CLOUDSTACK-6508: impossible to list projects from API with domainid set 2014-07-22 13:36:42 -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
Wei Zhou 9b7ac9dfac [UI] show all secondary ips in VM NIC page 2014-07-03 11:20:22 +02:00
Rajani Karuturi dae442e091 COVERITY: Fixed few coverity issues unused assignments, boxing and unboxing of values etc. 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-07-02 16:08:00 +02:00
Daan Hoogland 8d0f49addd CLOUDSTACK-6747: call a more forgiving test on the supplied peer 
cidr-list
(cherry picked from commit 17850c7aff)

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2014-06-25 17:16:08 +02:00
Edison Su f304df0be9 Merge branch '4.3-forward' into 4.3 2014-06-04 16:25:13 -07:00
Sebastien Goasguen 24e03bed56 Fix usage response, patch by Hiroki Ohashi 2014-05-29 09:48:46 +02:00
Daan Hoogland c0cf817f1b Revert "CLOUDSTACK-6485: private gateway network should not be associated with vpc" 
This reverts commit c37df38c83.
 2014-05-08 11:21:27 +02:00
Sam Schmit e8047e11db CLOUDSTACK-6472 (4.3 specific) listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls. 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-05-06 08:57:30 -04:00
Jayapal 2215fbf4c9 CLOUDSTACK-6240 Fixed updating advanced SG rules for vm nic secondary ip 2014-05-05 11:00:53 +05:30
Rajani Karuturi 9303e7016b Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-04-29 12:11:08 +05:30
Daan Hoogland c37df38c83 CLOUDSTACK-6485: private gateway network should not be associated with vpc 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-28 15:18:58 +02:00
Pierre-Yves Ritschard 08997a9ba3 handle removed entities 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-04-25 16:35:10 -04:00
Sheng Yang a28933085c CLOUDSTACK-6433: Don't return success if only one of RvR successfully created 2014-04-16 17:57:59 -07:00
Edison Su d2bec2e14f CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex 
(cherry picked from commit d4fdc184fe)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-17 16:27:25 -07:00
Edison Su d4fdc184fe CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex 2014-03-17 14:37:49 -07:00
Alena Prokharchyk 94817c1b4b CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately 2014-03-14 11:43:40 -07:00
Daan Hoogland 6a6ec64809 CLOUDSTACK-6232 allow expansion of ip on isolated networks as well 
(cherry picked from commit edf97ac86c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-12 14:05:10 -07:00
Daan Hoogland edf97ac86c CLOUDSTACK-6232 allow expansion of ip on isolated networks as well 2014-03-12 19:40:08 +01:00
Daan Hoogland 4161650c6b check-style: tabs to spaces(cherry picked from commit 0379dbb489) 
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-12 11:17:41 -07:00
Daan Hoogland 9af90e319d [CLOUDSTACK-6232] bridging allowed in isolated networks 
(cherry picked from commit f78e7ae51f)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-12 11:03:22 -07:00
Daan Hoogland 0379dbb489 check-style: tabs to spaces 2014-03-12 18:09:36 +01:00
Daan Hoogland f78e7ae51f [CLOUDSTACK-6232] bridging allowed in isolated networks 2014-03-12 17:57:09 +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
Marcus Sorensen 859a78e1d3 CLOUDSTACK-6194: Failed to increase Shared network IP Range 
Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>
(cherry picked from commit 135247afd1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-10 10:15:04 -07:00
Alena Prokharchyk 3b92031de9 CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state 
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
(cherry picked from commit 164ea3e84f)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-10 10:02:19 -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
Alena Prokharchyk 164ea3e84f CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state 
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2014-03-07 16:44:39 -08:00
Alena Prokharchyk 21172a2dc5 CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well 
(cherry picked from commit d009c8c7b229a1bb02834f52d9cac17f46e33349)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-03-06 15:17:26 -08:00
Alena Prokharchyk 8fdf941cc3 CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well 2014-03-07 01:08:01 +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
Marcus Sorensen 135247afd1 CLOUDSTACK-6194: Failed to increase Shared network IP Range 
Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>
 2014-03-07 01:08:00 +07:00