tuna
7efab20300
fix staticNat after rebase
2013-12-09 23:33:15 +07:00
tuna
4d0602175c
refactor ovsProvider to new resource
2013-12-09 23:33:15 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Min Chen
a416f6c3c3
Fix API build error based on new DB schema, now only
...
RoleBasedEntityAccessChecker needs to be fixed.
2013-12-06 15:09:00 -08:00
Syed Ahmed
ee7380ace2
CLOUDSTACK-5296: Add certificate chain support for netscaler
...
This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
2013-12-05 15:35:28 +05:30
Min Chen
c3f480e9b9
Updated db schema based on latest FS. Still need to fix old code in
...
AclServiceImpl, RoleBasedEntityAccessChecker and QueryManagerImpl to
make all build.
2013-12-04 18:44:30 -08:00
Alena Prokharchyk
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Bharat Kumar
68406ba29d
CLOUDSTACK-5161 enable scaling of a vm using custom offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +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
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
Harikrishna Patnala
b2f0a0bce2
CLOUDSTACK-4737: handling usage events for dynamic compute offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 17:07:30 +05:30
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
Prachi Damle
cf69731a52
Suring startup load the API permissions from commands.properties and @APICommand annotations
2013-11-25 17:01:56 -08:00
Alena Prokharchyk
c37e8b7e8c
Resource metadata - fixed the bug in removeResourceDetail API - when "key" parameter was passed in, used to remove the details matching the key, for all the resources, not just the one defined by resource_id
2013-11-25 15:32:52 -08:00
Prachi Damle
f231cec5b7
Loading api permissions from commands.properties during startup
2013-11-25 10:59:12 -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
Hugo Trippaers
3a414a850f
Add the upgrade path to all versions
2013-11-21 16:38:08 +01: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
Wido den Hollander
036fffcd7c
Add upgrade path from 4.3 to 4.4
2013-11-21 15:48:01 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -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
Min Chen
7ed030115e
Updated DB schema and DAO layer classes according to new FS.
2013-11-20 17:32:09 -08:00
Prachi Damle
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
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
Syed Ahmed
481af07fb1
Adding protocol parameter to loadbalancer response
2013-11-19 22:12:44 +05:30
Kishan Kavala
a9413707c9
Fix listRouter by clusterId and upgradeRouterTemplate by clusterId
2013-11-18 13:05:34 +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
Alena Prokharchyk
4a8e9f8b8d
Resource Metadata: added implementation for Remote Access VPN
2013-11-13 14:26:16 -08:00
Min Chen
8b7b7a041d
Delay in displaying VM migrate dialog due to get vm snapshot size for a
...
storage pool.
2013-11-11 14:40:16 -08:00
Dave Brosius
3fd95fe231
set the state field, not unused local
...
Signed-off-by: Dave Brosius <dbrosius@mebigfatguy.com>
2013-11-09 14:00:19 +01:00
Laszlo Hornyak
b33a8371bc
license headers added
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-09 09:06:01 +01:00
Alena Prokharchyk
8bd1eaa210
ResourceMetaData: added support for userIpAddress (publicIp) metadata
2013-11-08 10:48:43 -08:00
Rajesh Battala
19e9849d86
Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
...
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
Syed
0076307863
Squashed merge of Ssl Termination feature
...
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Chris Suich
aef633f203
Updated VMSnapshotDetails* to match *Details* pattern (e.g. UserVMDetails*)
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-11-07 14:28:19 -08:00
Alena Prokharchyk
99acb97854
CLOUDSTACK-5089: fixed VPCDao to set the accountId field correctly
2013-11-07 13:38:13 -08:00
Kishan Kavala
3f5b8f7063
CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router
2013-11-07 19:49:05 +05:30
Hugo Trippaers
b736cbd27a
Fix CID 1127024 Various resource leaks
2013-11-07 14:57:40 +01:00
Jayapal
416206595e
CLOUDSTACK-4736 Fixed issue in default service selection
2013-11-07 17:11:03 +05:30
Bharat Kumar
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
Mike Tutkowski
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
Kelven Yang
191dc80fa4
VM power state for job oritented sync processing
2013-11-05 19:00:37 -08:00
Nitin Mehta
7a042e2330
CLOUDSTACK-5038:
...
used cpu is getting bumped up when the over provisioning factor > 1. This was because we didnt record the overprovisioning factors of the vms which got deployed pre 4.2
Upgrade path will fix that by populating the cpu/mem overprovisioning factors for each of the vms in user_vm_details table using the global overprovisioning factor.
Reviewed by : bharat kumar <bharat.kumar@citrix.com>
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-11-05 16:35:52 -08:00
Jayapal
b464a20a52
CLOUDSTACK-4736: Monitoring services in VR
2013-11-05 23:39:33 +05:30
Harikrishna Patnala
a286dec098
CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-05 16:12:36 +05:30
Likitha Shetty
2f45940493
CLOUDSTACK-5028. Vmware instance fails to start when the chain_info of any volume that belongs to the VM is longer than 255 characters.
...
If the VM has snapshots then the chain_info of a volume can be longer than 255 characters.
Increasing the column length of chain_info in VolumeVO to match the maximum length of type text(db schema type)
2013-11-05 13:24:37 +05:30
Min Chen
ce3638bb03
Merge branch 'master' into rbac.
2013-11-04 15:49:29 -08:00
Alena Prokharchyk
2ff791b0b8
CLOUDSTACK-5025: volumes.display_volume field should be set to 1 by default. DB used to handle this, but VO was missing the default field assignment. Fixed th
...
e VO and db upgrade to update all existing volumes with 1 value
2013-11-01 22:48:11 -07:00
Darren Shepherd
c1bae7984a
Revert "Commit 1460196496 changed db.properties"
...
This reverts commit a3cec3802c .
2013-11-01 22:25:53 -07:00
Min Chen
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
Edison Su
c5bec6b336
add quiescevm in createvmsnapshotcmd
2013-10-31 16:45:05 -07:00
Alena Prokharchyk
78b1ac4126
CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page
...
Conflicts:
server/src/com/cloud/usage/UsageServiceImpl.java
utils/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-31 15:25:57 -07:00
Darren Shepherd
afaf6370dd
Fix change that broke db.properties.override
2013-10-31 09:21:34 -07:00
Hugo Trippaers
a3cec3802c
Commit 1460196496 changed db.properties
...
loading, this also affects the database creator. This make the database
creator use the new loading completely instead of partially.
2013-10-31 15:08:25 +01:00
Sheng Yang
3205cd42b5
CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
...
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.
Test case also included.
The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
Darren Shepherd
1460196496
Centralize loading of db.properties to one place
...
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07:00
Alena Prokharchyk
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -07:00
Min Chen
6be228a438
CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
...
storage to S3.
2013-10-28 21:01:31 -07:00
Alena Prokharchyk
2cac1aaa0f
Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud)
2013-10-28 15:03:57 -07:00
Alena Prokharchyk
5caeab782d
ResourceDetails -
...
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
Alena Prokharchyk
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
Edison Su
70b2c0150d
rebase to spring changes
2013-10-25 18:15:36 -07:00
Edison Su
51a8086cf6
Merge branch 'pluggable_vm_snapshot'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/resources/storageContext.xml
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
Edison Su
a6ce66e55a
move a lot of code into vmsnapshot strategy
...
fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases
2013-10-25 15:09:04 -07:00
Alena Prokharchyk
300f626d42
Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase
2013-10-25 14:21:20 -07:00
Alena Prokharchyk
0fb4d9d5a2
Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors.
2013-10-25 10:56:19 -07:00
Bharat Kumar
e4a1ff818f
CLOUDSTACK-4947 VM creation fails if the global config apply.allocation.algorithm.to.pods is set to true."
2013-10-25 15:07:00 +05:30
Sheng Yang
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -07:00
Alena Prokharchyk
24725f8e21
ResourceDetails:
...
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Alena Prokharchyk
765832a5cf
CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-24 10:34:21 -07:00
Alena Prokharchyk
2bb716efd8
ResourceMetaData (Resource details) fixes:
...
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Darren Shepherd
df728fcf41
Include new DAO added since spring-modularization branch
2013-10-23 11:23:52 -07:00
Darren Shepherd
e3280bdba2
Merge remote-tracking branch 'origin/spring-modularization'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/nonossComponentContext.xml.in
client/tomcatconf/simulatorComponentContext.xml.in
framework/db/src/com/cloud/utils/db/Transaction.java
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
Anthony Xu
e33ae74067
CLOUDSTACK-4649:
...
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.
Anthony
2013-10-22 17:54:51 -07:00
Alena Prokharchyk
d79135f4e6
CLOUDSTACK-4649: allow to update template details with addResourceDetails API
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 14:01:54 -07:00
Alena Prokharchyk
3ec14c4baf
CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter)
...
Conflicts:
api/src/org/apache/cloudstack/api/response/UserVmResponse.java
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 13:50:43 -07:00
dhoogland
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
Wei Zhou
db890bc71e
fix a bug in findAllChildren of domains
2013-10-21 14:02:53 +02:00
Min Chen
ec3302afd6
CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in
...
initial attempt, but they are coming up after multiple attempts.
2013-10-17 15:59:10 -07:00
Darren Shepherd
711ad386d1
Random cleanup
2013-10-16 16:18:49 -07:00
Nitin Mehta
fc6c1ec812
CLOUDSTACK-4882:
...
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-16 15:02:18 -07:00
Darren Shepherd
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Kishan Kavala
81f1a0b831
CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required
...
Conflicts:
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-16 19:28:42 +05:30
Min Chen
ac02987db2
Add upgrade path from 4.2.1 to 4.3.0.
2013-10-14 21:56:34 -07:00
Nitin Mehta
fa0c685bcb
CLOUDSTACK-4854:
...
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-10 19:18:39 -07:00
Alena Prokharchyk
c4084a7c34
Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it.
2013-10-10 11:13:47 -07:00
Prachi Damle
5c7db71bbb
Duplicate getter-setter after merge
2013-10-10 00:47:36 -07:00
Prachi Damle
ec4fa61ae3
Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker
2013-10-10 00:46:06 -07:00
Prachi Damle
0b1aaf514f
More logic to Role based checker
2013-10-10 00:43:56 -07:00
Harikrishna Patnala
bb7493775c
CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived templates Template created from a volume or snapshot did not have the sourcetemplateid field set in vm_template table.
2013-10-10 12:20:40 +05:30
Min Chen
2b4703b6e6
Change ListVMsCmd to use new role and entity permission information.
2013-10-09 21:56:52 -07:00
Min Chen
9cd1a95327
Fix search criteria to support searching both specific entityType and *.
2013-10-08 14:50:46 -07:00
Min Chen
11fe1f527a
Add role permission for normal user role.
2013-10-08 11:08:54 -07:00
Min Chen
b87b9e5c64
Add Scope to acl_role_permission, remove parent_role_id from acl_role
...
table, and create PermissionScope and AclEntityType enum types.
2013-10-07 16:09:26 -07:00
Nitin Mehta
6e80bb001c
CLOUDSTACK-4824:
...
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00
Prachi Damle
579806440b
Add permission flag to acl_entity_permission
2013-10-07 14:30:15 -07:00
Prachi Damle
385dfc230f
Schema and VO/Dao for Role Permission
2013-10-07 12:33:28 -07:00
Darren Shepherd
d769a73cfc
Fix DatabaseUpgradeChecker in standalone context
...
When running DatabaseUpgradeChecker as a standalone program _dao will not
be injected. Still create an instance of VersionDaoImpl in constructor
and when DatabaseUpgradeChecker is ran in the mgmt server it will be
overwritten by the injected value.
2013-10-07 11:57:55 -07:00
Min Chen
ded2785bb1
Add interface method to remove account group association from
...
acl_group_account_map.
2013-10-07 11:46:40 -07:00
Laszlo Hornyak
bd8536739c
remove txn attribute from DB
...
txn attribute was never actually used
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
Darren Shepherd
67186429e1
Spring Modularization
...
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Nitin Mehta
8466fad6ca
CLOUDSTACK-4785:
...
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
Nitin Mehta
85b5c6e353
CLOUDSTACK-4785:
...
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Alena Prokharchyk
a2bf7f035e
CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services
2013-10-02 11:09:44 -07:00
Min Chen
5583506c0c
Add entity permission grant and revoke API.
2013-09-30 17:03:34 -07:00
Alena Prokharchyk
43770e0cb2
CLOUDSTACK-4744: enhanced root admin API updateVolume with state/storageId parameters as a part of "Better control over first party objects" feature.
...
Also fixed existing bugs for the API:
* corrected action event to be VOLUME.UPDATE (was VOLUME.ATTACH)
* all parameters to update, should be optional - fixed that. If nothing is specified, the db object will remain with its original fields
2013-09-28 21:44:47 -07:00
Alex Huang
b60eef3e82
Added comments and finished off the work
2013-09-28 07:53:28 -07:00
Alex Huang
e8cac2c5d8
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:26 -07:00
Alex Huang
e2988902c9
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:25 -07:00
Alex Huang
a964cf549e
Continue to merge SearchCriteria2 and GenericSearchBuilder
2013-09-28 07:53:24 -07:00
Alex Huang
af8832f6bd
Unified both the SearchBuilder and SearchCriteriaService
2013-09-28 07:53:24 -07:00
Min Chen
0be374a796
Add All Apis for ACL Group.
2013-09-27 18:16:18 -07:00
Min Chen
97fd99b09a
Add all Apis for AclRole.
2013-09-26 17:48:29 -07:00
Min Chen
fce2aad23d
WIP For APIs related to ACL Roles.
2013-09-26 11:22:43 -07:00
Edison Su
b3ac12e171
delete snapshot_store_ref if the snapshot is in error state
2013-09-25 15:51:55 -07:00
Darren Shepherd
9fb0a1a619
Don't check implementation version of Object for DatabaseUpgradeChecker
2013-09-25 14:34:14 +02:00
Prachi Damle
4294005142
Check if an Account belongs to RootAdmin group
2013-09-24 17:01:43 -07:00
Min Chen
ddae23c168
Add parent_role_id to acl_role table.
2013-09-23 13:18:57 -07:00
Wei Zhou
62d49b3524
CLOUDSTACK-4716: upgrade resource count (cpu,memory,primary_storage,secondary_storage) in the upgrade to 4.2
...
(cherry picked from commit 38bbfdc89a )
Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:19:03 +02:00
Alena Prokharchyk
2fa5a5ae97
CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC
...
(cherry picked from commit 798f34a49c )
Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:18:41 +02:00
Min Chen
12b6e700b6
The first version of all the ACL VOs and DAOs.
2013-09-19 17:50:33 -07:00
Min Chen
354588611a
Add missing table acl_group_role_map, as well as adding columns.
2013-09-19 17:49:49 -07:00
Prachi Damle
3333a04c40
During Upgrade to 4.3, Populate the API Permissions per Out-Of-Box Role from commands.properties file
2013-09-19 12:32:54 -07:00
Min Chen
ad6af49f03
Populate acl_group_account_map for existing accounts.
2013-09-19 10:26:59 -07:00
Prachi Damle
f2ea699d12
CLOUDSTACK-4668: Upgrade to 4.2 fails with NullPointerException when hypervisor_type is null for a cluster entry
...
Changes:
- Care for null value during comparing the hypervisor_type
- Do not consider removed clusters
- Method rename according to coding conventions
2013-09-18 16:52:01 -07:00
Daan Hoogland
2614b00c51
sdn hosted vpc gateways (using lswitch)
2013-09-18 16:56:56 +02:00
Min Chen
1042136c23
CLOUDSTACK-4661:[DB Upgrade] SecondaryStorage entry in host table before
...
upgrade is not marked as removed after migrating them to image_store
table.
2013-09-12 18:55:41 -07:00
Alex Huang
435e74e914
Commit to try something on removing getZone
2013-09-06 15:40:33 -07:00
Alex Huang
2e5bb63f77
Moved NetworkManagerImpl to NetworkOrchestrator
2013-09-06 15:40:32 -07:00
Sanjay Tripathi
108aab7665
CLOUDSTACK-4495: systemVM template URL is pointing to old template location in upgrade file.
2013-09-05 13:05:16 +05:30
Nitin Mehta
654c90f4e5
CLOUDSTACK-4327:
...
Check for the all the transition states for Maintenance. Also corrected the isMaintenance function for StoragePoolVo
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-09-05 12:43:36 +05:30
Kelven Yang
ae231444bc
CLOUDSTACK-4585: make run-time datastore folder migration, VM snapshot, bug in root disk controller type carried from previous version work under upgrade situation
2013-09-04 14:49:46 -07:00
Kelven Yang
458de9321d
More fixes found in test cases when JVM assertion check is turned on
2013-09-04 14:49:45 -07:00
Kelven Yang
f383656b21
Fix problems found in local test when JVM assertion is turned on
2013-09-04 14:49:44 -07:00
Kelven Yang
249e2e8f59
Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection
2013-09-04 14:49:44 -07:00
Vijayendra Bhamidipati
57dc52bb6f
CLOUDSTACK-4539: [VMWARE] vmware.create.full.clone is set to true in upgraded setup;default nature of vms are full clone
...
Description:
Set the criterion for overriding/preserving the vmware.create.full.clone
flag so that if past version deployments have any deployments (data centers),
this flag will be set to false. Else, it will be set to true.
The earlier criterion to set this flag was based on the CS version numbers,
but that is not a good business logic to serve as a basis to set the flag.
2013-09-04 05:58:25 -07:00
Prachi Damle
0115db0819
CLOUDSTACK-4369 [UPGRADE]Upgrade failed from 307 to 4.2
...
Changes:
- Do not consider removed zones
- Create affinity group per domain
2013-09-03 20:03:08 -07:00
Prachi Damle
6a8043e040
CLOUDSTACK-4561: DeployVm failed after upgrading from earlier version having a private zone to 4.2
...
Changes:
- In the upgrade path, for a private zone, entry needs to be added in the affinity_group_domain_map to provide access to the private zone for the domains it belongs too.
2013-09-03 20:03:01 -07:00
Prachi Damle
ef22b42b38
CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
...
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.
Conflicts:
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
Prachi Damle
a06bd9fa2b
CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
...
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.
Conflicts:
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Wei Zhou
62b09c9253
CLOUDSTACK-2319: fix incorrect account_id in event table for Revoke SecurityGroupRule commands
...
(cherry picked from commit d9ba234d6c )
2013-09-02 16:53:55 +02:00
Wei Zhou
1a67750cb6
CLOUDSTACK-4538: set default value of cpu.overprovisioning.factor and mem.overprovisioning.factor to 1
...
On a fresh environment, some values in cloud.configuration table are persisted in com.cloud.server.ConfigurationServerImpl.persistDefaultValues()
A default value need to be set before com.cloud.upgrade.DatabaseUpgradeChecker
2013-08-29 12:41:18 +02:00
Wei Zhou
53ee2c905b
CLOUDSTACK-4538: fix small typo
...
(cherry picked from commit 68b668ae8f )
2013-08-29 11:33:37 +02:00
bharat kumar
da6f048dd2
CLOUDSTACK-4538 Should update the vmware clusters with the global overporvisioning factors after upgrade to 4.2.
...
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-08-29 12:26:54 +05:30
Min Chen
6a9caf7487
CLOUDSTACK-4430:[Automation][vmware] Failed to deploy vm, if one host is
...
down in a cluster.
2013-08-28 11:52:06 -07:00
Min Chen
543088a203
CLOUDSTACK-4520: [upgrade][vmware]ExtractVolumeCmd fails with NPE while
...
attempting to download a volume.
2013-08-27 13:59:27 -07:00
Alex Huang
abbae2aa87
Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.
2013-08-26 17:31:10 -07:00
frank
b37e6c14c1
CloudStack CLOUDSTACK-1365
...
UI support for baremetal PXE server
CloudStack CLOUDSTACK-1364
UI support for baremetal DHCP server
Conflicts:
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
2013-08-22 16:35:23 -07:00
Kishan Kavala
ad0fba31a3
CLOUDSTACK-4115 : Encrypt password in cluster_details table. This fix is to handle upgrades from versions earlier than 3.0.5 and 4.0. Upgrade was not handled when the cluster_details password encryption was introduced.
2013-08-22 18:53:45 +05:30
Min Chen
3bd2bbf59d
CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in
...
case of region-wide secondary is enabled.
2013-08-20 14:13:49 -07:00
Alena Prokharchyk
f1c63df665
CLOUDSTACK-4403: vmInstanceDao - initialize the SearchBuilder in init() method instead of the search dao method which wasn't thread safe, and could cause NPEs during search builder initializing.
2013-08-19 10:28:23 -07:00
Sateesh Chodapuneedi
17b6f1c570
CLOUDSTACK-4294 After upgrade of CloudStack to 4.2, support old vswitch type in existing clusters if user changes the vswitch backend to another type of vSwitch
...
While upgrading to 4.2, the type of vswitch being used by each cluster is persisted to cluster_details table. This helps if user want to change the type of vswitch used in a zone or entire cloud later on but leave existing cluster continue to use old vswitches. Hence even after modifying the type of vswitch at cloud level (by modifying global configuration parameters) or modifying the type vswitch at zone level (by modifying the traffic label) would not disturb operation of existing clusters.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-19 16:32:14 +05:30
Edison Su
37d58313c9
CLOUDSTACK-4325: if userdispersing algorithm is used, then zone wide storages never been picked up
2013-08-14 15:52:55 -07:00
Mike Tutkowski
0f60b5d41c
CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack
2013-08-14 15:02:57 -06:00
Wei Zhou
02d1757724
CLOUDSTACK-4316: updateSystemVms is not need in Upgrade304to305 as new templates are used in upgrade from 4.1 to 4.2
2013-08-14 11:03:52 +02:00
Alena Prokharchyk
b2d2f2c050
Fixed deployDb - in setRAWformatForRBDVolumes use executeUpdate instead of executeQuery when perform an update with the prepared statement
2013-08-13 17:14:25 -07:00
Min Chen
5c35bd1b3e
CLOUDSTACK-3860: S3 and Swift-backed Secondary Storage Migration
2013-08-13 11:55:03 -07:00
Wido den Hollander
04f378bcff
CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2
2013-08-13 16:14:45 +02:00
Likitha Shetty
b172eb21c4
CLOUDSTACK-4279. Usage manager - Parameter index out of range error
2013-08-13 15:58:17 +05:30
Alex Huang
0e19e82fac
Split up the volume manager into two. One part is for self-service. One part belongs in the engine. Removed old 2.1 upgrade code. In order to upgrade from 2.1, you must upgrade to 2.2. first. So therefore these files are no necessary in the newer versions of CloudStack
2013-08-12 19:05:22 -07:00
Murali Reddy
5cff9bd2e6
CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
...
only when there is portable IP range added at region level.
region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
Harikrishna Patnala
5404bf6063
CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2
...
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
2013-08-10 18:02:49 +05:30
Koushik Das
8cf48ed2ce
CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher
...
The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.
The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-08-09 16:57:21 +05:30
Kishan Kavala
0eb67bff12
CLOUDSTACK-4146, CLOUDSTACK-4147: Fix KVM snapshot upgrade.
...
when migrating KVM snapshot path, CONCAT is not required. back_snap_id is complete path for KVM snapshots
2013-08-09 14:50:26 +05:30
Alex Huang
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc .
2013-08-08 15:02:40 -07:00
Alena Prokharchyk
4976a67bfc
CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId
2013-08-08 10:49:12 -07:00
Koushik Das
12ba37c8af
CLOUDSTACK-4136: [upgraded ENV]Deleting Snapshot which was created before upgrade is throwing NPE.
...
Snapshot object is being accessed even when it is null. In case snapshot is not present in backup store the code should return after cleaning db entry.
Also noticed discrepancy in the upgraded db setup but couldn't fully verify it, so added logging in the upgrade logic for template/snapshots etc.
2013-08-08 15:13:08 +05:30
Prasanna Santhanam
b59e3aaefc
Reverting the range of commits that broke the build
...
This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Sateesh Chodapuneedi
3e85f480c4
CLOUDSTACK-4165 3.0.6 to ASF 4.2 Upgrade: Data Migration step of the Upgrade Fails on "persistLegacyZones"
...
Track the Datacenter of previous cluster correctly while going through each cluster in the zone to see if 2 clusters are from different DC/vCenter.
Cherry picked from 4.2 commit a3450afff5
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-08 09:02:17 +05:30
Alex Huang
5287f4c9ec
Got everything running through testing
2013-08-07 16:41:06 -07:00
Alex Huang
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
Bharat Kumar
e55844c364
Cloudstack-4100 preserve data in iso_id column while upgrading from 3.0.7 to 4.2
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-07 18:47:05 +05:30
Marcus Sorensen
789ac14c14
Summary: CLOUDSTACK-4121 fix local storage volume deployment
...
Detail: Fix hypervisor type lookup for local storage volumes by
adding in a statement for the 'HOST' storage scope.
Reviewed-by: Rajesh Battala
2013-08-06 21:37:11 -06:00
Min Chen
93814d1738
CLOUDSTACK-4002: We should use backup_snap_id in snapshots table to
...
construct snapshot install_path in snapshot_store_ref for pre-4.2.0
snapshot.
2013-08-06 15:04:57 -07:00
Min Chen
5908a3931c
CLOUDSTACK-4002:Fix snapshot install path for upgraded snapshots.
2013-08-06 15:04:57 -07:00
Rajesh Battala
7bb0e2a4ca
CLOUDSTACK-3781 Unable to resize disk with Zone wide storage
2013-08-06 12:59:06 -07:00
Bharat Kumar
1a89bc06c8
Cloudstack-4015 No error logged when deleteing all the valns when there are allocateed vnets. Alos not updating the vnet range in physicalnetworks table in the above case.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-08-06 17:28:22 +05:30
Harikrishna Patnala
c1e78809b2
CLOUDSTACK-4070: upgrade from 2.2.14 to 4.2 is failing with 4.0 VMware SystemVm template not found. Cannot upgrade system Vms
...
System template upgrade is not required during 4.0 upgrade since we handle the same during 4.2 upgrade. So removing the system template update during 4.0 upgrade.
2013-08-06 17:17:20 +05:30
Kishan Kavala
95e15833b9
Encrypt pre shared key in Site2Site customer gateway DB entries
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-06 17:01:31 +05:30
Prasanna Santhanam
0eafc0c0d8
CLOUDSTACK-4064: Missed renaming the config for KVM snapshots
...
KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2)
2013-08-06 10:39:14 +05:30
Alena Prokharchyk
beabf596ba
CLOUDSTACK-4080: don't GC the network when it has vms in Starting state even when the nics are not allocated for them yet (can happen when vm is being created)
2013-08-05 14:15:04 -07:00
Alena Prokharchyk
19c7cecde4
CLOUDSTACK-4065: db upgrade - when insert placeHolder nic for Shared networks, always mark this nic as non-default explicitly
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-05 09:21:08 -07:00
Harikrishna Patnala
506f2a4b94
CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-05 18:19:16 +05:30
Min Chen
151a7ee497
CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.
2013-08-02 18:16:46 -07:00
Alex Huang
8930cfa983
Switched over to use the new jobs framework
2013-08-02 11:07:55 -07:00
Bharat Kumar
65370f31bc
upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes"
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 17:07:22 +05:30
Wei Zhou
0529da136f
upgrade: Add upgrade patch to 4.3.0
2013-08-02 11:50:19 +02:00
Min Chen
2e0f11f15f
CLOUDSTACK-4002: [Upgrade][2.2.16 to 4.2] After upgrade creation of
...
volume from a snapshot which was existing before upgrade, fails with NPE
2013-08-01 17:08:49 -07:00
Bharat Kumar
21f1b137cb
Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
...
Reviewed-by: Alena Prokharchyk
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -07:00
Alena Prokharchyk
f444ce7f65
CLOUDSTACK-4015: don't insert the fake template record when upgrade from 304 to 305
2013-08-01 09:58:43 -07:00
Chip Childers
8225374138
Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
...
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00