Wei Zhou
abd4a826e9
Revert "CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer"
...
This reverts commit 5cc47f77c5d7c1c8c40c5e7cb2f7083fd2ce56cd.
2013-11-29 10:52:51 +01:00
Wei Zhou
5cc47f77c5
CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer
2013-11-29 10:39:04 +01:00
Hugo Trippaers
36201b9776
Fix issue with sourceCidr not being passed to the VRouter on start.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-29 13:20:12 +05:30
Likitha Shetty
6bda2739c8
CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0%
2013-11-28 15:52:42 +05:30
Wei Zhou
221aea5730
CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set.
2013-11-28 10:47:21 +01:00
Abhinandan Prateek
ab39b658ad
added valid values for system.vm.default.hypervisor in desc
2013-11-28 09:24:32 +05:30
Alena Prokharchyk
426f564944
Resource metadata support for NetworkACLItem
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
2013-11-27 14:38:12 -08:00
Wei Zhou
f17f35eeb8
CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso
2013-11-27 14:38:25 +01:00
wilderrodrigues
226b193488
Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 14:20:29 +01:00
wilderrodrigues
2774b62d64
Fixing bugs from Coverity related to Dereferenced Null after check and as return value.
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 11:18:00 +01:00
Alena Prokharchyk
7af387c894
Resource metadata support for NetworkACLList
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-11-26 17:12:12 -08:00
Nitin Mehta
414d415dba
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
Alena Prokharchyk
5d974a234c
Resource metadata support for VPC Private Gateway
2013-11-26 12:48:15 -08:00
Nitin Mehta
6bea532efa
CLOUDSTACK-5206: Ability to control the external id of first
...
class objects. Putting in the generic methods and trying it
for objects like vm, volume. This is the first cut
2013-11-26 09:52:17 -08:00
Wei Zhou
9be402cb06
CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM
...
(cherry picked from commit e23b10319f55fe8cbb822c0c29dc64b56509c119)
Conflicts:
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
server/src/com/cloud/storage/upload/UploadMonitorImpl.java
2013-11-26 15:01:23 +01:00
Wei Zhou
e0fbc3f147
CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative
...
(cherry picked from commit 888ddd724aabbd22d675fe2bba873971888e1a8a)
2013-11-26 14:43:23 +01:00
Bharat Kumar
ef40e156ed
CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 14:32:30 +05:30
Nitin Mehta
a1ca4f1d56
CLOUDSTACK-5221:
...
In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed.
2013-11-25 13:47:42 -08:00
Anshul Gangwar
102331c62e
CLOUDSTACK-4959: added the connection and socket timeout parameters for SMTP and sending message in new thread so that HA doesn't get blocked beacause of hang in sending email alert
2013-11-25 15:52:33 +05:30
Min Chen
6227ba6356
CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from
...
ROOT volume fails with NullPointer Exception due to new jobs framework
merge.
2013-11-22 10:56:27 -08:00
Alena Prokharchyk
7df7abf327
Added missing @Inject to the ipAddressManager
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2013-11-21 14:29:39 -08:00
Alena Prokharchyk
602d4ef0cf
Resource metadata - support for VPC
2013-11-21 14:29:39 -08:00
Alex Huang
433a631916
Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.
2013-11-21 07:56:47 -08:00
Alex Huang
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
Hugo Trippaers
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
Alex Huang
62e9273581
Removed trailing spaces
2013-11-21 03:12:05 -08:00
Murali Reddy
899e9f0d60
CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as
...
"Public IP Address" for system VMs
In system VM response object return EIP as public IP in case of basic
zone with EIP service.
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2013-11-21 15:20:28 +05:30
Likitha Shetty
6aafb9c50d
CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API.
...
During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters.
2013-11-21 13:40:06 +05:30
Wido den Hollander
1edaa36cc6
CLOUDSTACK-1302: Allow a cache mode per disk offering
...
Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
Likitha Shetty
90fb76a72c
CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable.
2013-11-20 16:12:22 +05:30
fjkdf
8321ea4d78
add mgt.server.vendor global configuration, in case different vendor wants to identify its identity
2013-11-19 17:55:58 -08:00
Alex Huang
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -08:00
Syed Ahmed
481af07fb1
Adding protocol parameter to loadbalancer response
2013-11-19 22:12:44 +05:30
Hugo Trippaers
1ece5f0c28
StoragePoolResponse.getId() returns a String with an UUID
2013-11-18 14:27:06 +01:00
Kishan Kavala
a9413707c9
Fix listRouter by clusterId and upgradeRouterTemplate by clusterId
2013-11-18 13:05:34 +05:30
Harikrishna Patnala
c29cd9d3c7
CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
...
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot
CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 12:19:31 +05:30
Prasanna Santhanam
bf22f6dfe9
Revert "CLOUDSTACK-5176:"
...
ConfigurationParameterScope class is missing. Possibly an unadded new
file in the git commit.
This reverts commit 1762dbbb17a6cf974db8e145b1c601d954cd4c06.
2013-11-15 10:20:26 +05:30
Edison Su
1292b76c63
Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.
...
And also add a new table: snapshotdetails
2013-11-14 15:55:39 -08:00
Nitin Mehta
1762dbbb17
CLOUDSTACK-5176:
...
Added the cluster scope to vmware.reserve factors
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-11-14 15:44:13 -08:00
Darren Shepherd
1f7ef652cf
Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type
2013-11-14 15:31:33 -08:00
Anthony Xu
ac649b43e6
XS host free memory might change, if user manually changes dom0 memory,
...
this patch makes CS update latest XS host free memory on host connect process.
2013-11-14 12:07:29 -08:00
Anthony Xu
9c739ef93d
Revert "Revert "XS host free memory might change, if user manually changes dom0 memory,""
...
This reverts commit 74153e4a79a064139a6ecce48f8eb1308318beab.
2013-11-14 11:58:55 -08:00
Wei Zhou
59453ea6be
remove duplicated scheduled tasks from VpcVirtualNetworkApplianceManagerImpl
...
(cherry picked from commit e444a03819ccf72f61cb04e8428d20cc65b145e1)
2013-11-14 19:00:24 +01:00
Anthony Xu
74153e4a79
Revert "XS host free memory might change, if user manually changes dom0 memory,"
...
This reverts commit a1d09ae16f08c86bfca5c4a89dec371ef6d3ee67.
2013-11-13 15:38:42 -08:00
Alena Prokharchyk
4a8e9f8b8d
Resource Metadata: added implementation for Remote Access VPN
2013-11-13 14:26:16 -08:00