Nitin Mehta
3c68f1f8e8
bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state
...
Reviewed-by: Kishan
2012-08-03 17:18:13 +05:30
Alena Prokharchyk
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
Edison Su
3996094e55
Fix bug: can not deploy VM on ESXi due to incorrect
...
secondaryStorageResource used for SSVM
Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.
Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource
RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
2012-08-02 11:20:35 -07:00
Alena Prokharchyk
5cbe3d9722
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
...
Conflicts:
api/src/com/cloud/api/commands/ListVPCsCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
kishan
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
Alena Prokharchyk
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
kishan
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
Wido den Hollander
406fd95d87
Add RBD support for primary storage
...
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.
To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)
The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.
Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.
NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.
Other then these points you can run instances with RBD backed disks.
2012-07-26 22:22:26 +02:00
Edison Su
50ffa95f63
ifix CS-15609 Volumes can be created as a part of VM creation when
...
un-allocated space is insufficient on primary storage
check the availability of un-allocated primary storage space during
planning stage, for multiple-volume VM creation scenario
modification in StorageManagerImpl.java and StorageManager.java:
add a new method storagePoolHasEnoughSpace(List<Volumes>, StoragePool),
check if storagePool has enough space for all requested volumes
modification in FirstfitPlanner.findPotentialDeploymentResources:
handle multiple volume case, keep track of allocated volumes for pools
and call storagePoolHasEnoughSpace to check space availability
modification in AbstractStoragePoolAllocator.java:
extract capacity computation logic and make a new method in
StorageManagerImpl
RB: https://reviews.apache.org/r/6028/
Send-by: mice_xia@tcloudcomputing.com
2012-07-26 10:10:18 -07:00
Pranav Saxena
3fedd56adb
CS-12707: UI/API - templates> select view: ISOs filter by: featured or mine> provides unending pages of 2 ISO entries, DB contains only 19 ISO entrie- reviewed by Alena
2012-07-25 22:05:24 +05:30
Alena Prokharchyk
766b7a2706
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-23 16:38:58 -07:00
Koushik Das
88f7872b81
CS-15279
...
Issue happens when ROOT volume gets created and there is subsequent failure in starting the VM. During retry if allocator assigns a different storage pool the scenario was not handled. Now in case of local storage the volume get recreated on the newly assigned pool and old one gets cleaned up. In case of shared storage the existing volume is migrated to new storage pool.
2012-07-23 14:49:04 -07:00
bfederle
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
Chiradeep Vittal
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
Alena Prokharchyk
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
Alena Prokharchyk
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
Alena Prokharchyk
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Edison Su
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
Alena Prokharchyk
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
Alena Prokharchyk
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
Alena Prokharchyk
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
Alena Prokharchyk
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
Alena Prokharchyk
7acf8585b1
Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
...
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
api/src/com/cloud/api/response/VolumeResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
Edison Su
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
David Nalley
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
David Nalley
ae4b66283a
cleaning up some line endings
2012-07-02 09:50:28 -04:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
Edison Su
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
Murali reddy
cefbbb3850
moving random storage allocator to plugins/storage-allocators
2012-06-26 15:17:25 -07:00
anthony
973ccdaf4b
VPC : pass netmask once for secondary storage VM
2012-06-15 14:23:51 -07:00
Alena Prokharchyk
d9fd7e02a5
Plug nic support
...
Conflicts:
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
prachi
3fd17ae029
Merge awsapi related changes to CloudStack
2012-05-25 14:40:53 -07:00
Alena Prokharchyk
737543ce3e
CS-15025
...
listTemplates: made executable filters to work for regular user
2012-05-21 15:35:10 -07:00
Murali reddy
a4b0759c52
bug CS-14862: EIP/ELB - SSVM and CPVM should be given an ip address from the public ip address range.
...
With this fix both SSVM and CPVM will get public IP's in case of basic zone with EIP service.
A static NAT rule is implicitly configured on the EIP service provider to map public IP to a
guest IP address associated with SSVM/CPVM
2012-05-21 20:18:37 +05:30
Nitin Mehta
a4adc25295
bug CS-14945:
...
UploadVolume API is async now with the guidance for all the new apis added in 3.0.x need to be async. Though the success/failure wont be available through the queryAsync job which will report only the initial validation success or failure. The success or failure and the progress will all be available through listVolumes api.
2012-05-21 14:46:17 +05:30
Nitin Mehta
07cbec95fa
bug CS-14957: Return hypervisor type for uploaded volume
2012-05-17 19:22:19 +05:30
frank
d2b3ec84e9
CS-13853 secstorage.allowed.internal.sites is not allowed to be 0.0.0.0
...
resolved fixed
2012-05-16 11:57:36 -07:00
Edison Su
bafc3f2a5a
CS-14521
...
Remove CLVM, due to license issue
2012-05-15 15:13:15 -07:00
Edison Su
9fa63cfe61
CS-14609
...
turn on debug log, if zone is not ready to start ssvm/cpvm.
"Zone host is ready, but console proxy template" means system vm template is not in "Downloaded" state on secondary storage
"Primary storage is not ready" means the template is not been downloaded to primary storage, possible reasons: haven't add primary storage, or primary storage download is not finished/failed.
2012-05-15 14:44:48 -07:00
frank
910ae7446b
don't call _secMgr.generateSetupCommand each time copying template
...
it will reboot httpd making in processing copy fail
2012-05-14 14:15:30 -07:00
Nitin Mehta
acd55bac90
bug CS-14785: Allow attaching the volume for Uploaded volume. Also have transition fo delete volume.
2012-05-14 16:46:49 +05:30
Nitin Mehta
838d01754b
bug CS-14785: Improvements to volumes sync so that it can recover from any error. Introduced new state UploadOp which signifies that the volume os on secondary and the status would be picked up from volume host ref table.
2012-05-11 11:42:42 +05:30
Nitin Mehta
189ac88a11
bug CS-14785: String equality should be through equals function....what was i thinking !!!.
2012-05-08 16:07:52 +05:30
Nitin Mehta
0d2422720b
bug CS-14739: Check for the volume and vm hypervisor compatibility before attaching the volume to vm in case the volume is on secondary storage.
2012-05-04 17:29:22 +05:30
Nitin Mehta
c65d3bdace
bug CS-10789: Some more code to make the Uploav volume more robust.
2012-05-03 10:50:12 +05:30
Nitin Mehta
9097b53eab
bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded.
2012-05-03 10:46:02 +05:30
Nitin Mehta
d6e185a5f4
bug CS-10789: Decrement and increment the resource count on volume correctly.
2012-04-23 13:45:09 +05:30
Nitin Mehta
4434aa0d2d
bug CS-10789: More changes for the imageformat, introdueced new column in db for the format, created scripts for doffernt hypervisors ...and the list goes on.
2012-04-23 13:44:34 +05:30
Nitin Mehta
14adf23700
bug CS-10789: Adding more code changes for usage, delete volume .
2012-04-23 13:42:53 +05:30
Nitin Mehta
ac2175bdbc
bug CS-10789: Adding volume sync and delete functionality.
2012-04-23 12:29:38 +05:30
Nitin Mehta
54956280e6
Preliminary upload and attach changes work ..
2012-04-23 12:28:36 +05:30
Nitin Mehta
564cef8ddf
More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM.
2012-04-23 12:14:35 +05:30
anthony
bbd0259ad2
bug 14582: fix one big in upgrade from 2.1.4 to 3.0.2
...
status 14582: resolved
2012-04-20 17:02:57 -07:00
Nitin Mehta
e04822eb70
bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled.
...
Reviewed By: Kishan
2012-04-19 14:24:12 +05:30
Alena Prokharchyk
662a234916
CS-14297: added "forced" option to deleteStoragePool command. If forced=true, all destroyed volumes are marked as Expunged even when we can't reach primary storage at the moment of deletion.
...
Conflicts:
api/src/com/cloud/api/commands/StopVMCmd.java
2012-04-16 13:22:46 -07:00
Alena Prokharchyk
76c7c22b34
Bug CS-14447: set crossZones attribute for the template before persisting it to the db
2012-04-13 14:16:18 -07:00
David Nalley
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04:00
Alena Prokharchyk
2d1a6b0b35
bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
...
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
Alena Prokharchyk
b14bac0977
bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering
...
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
2012-04-03 10:52:32 -07:00
frank
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
Nitin Mehta
a5a7be4c7e
Bug 10808: Add Upload Volume api and do validation.
2012-03-24 13:59:59 +05:30
Alena Prokharchyk
29c61e6341
bug 14369: remove host entry when destroy CPVM/SSVM instances
...
status 14369: resolved fixed
2012-03-20 14:10:18 -07:00
Alena Prokharchyk
fec3a87d09
bug 14388: don't return console proxy / ssvm service offerings
...
status 14388: resolved fixed
2012-03-19 14:50:09 -07:00
frank
a6a54a2f87
Bug 14189 - multiple physical nw - SSVM fail to download guest templates from storage server which is in isolated network only accessible by host's bridge
...
if storage network is present, don't set route through private ip when adding internal download site
status 14189: resovled fixed
2012-03-16 14:49:30 -07:00
frank
7f8cf5a9ff
fix copying template
...
Conflicts:
console-proxy/scripts/ipfirewall.sh
2012-03-15 14:43:03 -07:00
Likitha Shetty
59262d67a3
Bug 13842 Check for snapshots in BackedUp state during the deletion of secondary storage
...
behalf of: pranav
reviewed by: kishan
2012-03-14 17:59:38 +05:30
Sheng Yang
e152e64ac0
Fix several wrong ResourceUnavailableException scopes
2012-03-08 11:55:31 -08:00
prachi
d2ecd8c89a
Bug 13999 - Non-admin user should not be able to take snapshots
...
Changes:
If Zone is disabled, deny permission to regular user while creating snapshots
2012-03-05 17:04:13 -08:00
Likitha Shetty
61ec79da44
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2012-02-27 14:43:50 +05:30
anthony
cde66fb4fe
bug 13832: fixed NPE
...
status 13832: resolved fixed
2012-02-23 13:27:01 -08:00
Alena Prokharchyk
6b9abf832b
bug 13944: when delete the account, expunge detached volumes on the backend
...
status 13944: resolved fixed
Reviewed-by: Frank Zhang
2012-02-22 17:59:22 -08:00
Edison Su
90020679a4
bug 13771: don't send pre snapshot if it's migrated
...
status 13771: resolved fixed
Reviewed-by: anthony
2012-02-22 17:21:24 -08:00
Likitha Shetty
1f91b76b06
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2012-02-20 10:44:39 +05:30
frank
a1fa313902
Bug 13568 - secondary storage VM's static route for nfs server breaks things!
...
status 13568: resolved fixed
reviewed-by: Sheng Yang
2012-02-17 16:24:32 -08:00
Nitin Mehta
87be3ca686
Bug 13836: NPE fix. If snapshot is already removed say so-do not try and delete it again.
...
Reviewed-By: Kishan
2012-02-17 16:29:49 +05:30
kishan
4ec26ae3cb
Bug 13794: When snapshot backup fails, snapshot.delete event is not required. Snapshot.create is logged only afetr successfull backup.
...
Status 13794: resolved fixed
Reviewed-By: Nitin
2012-02-17 16:17:39 +05:30
Likitha Shetty
b9761cd654
Bug 4644 (Pranav)
2012-02-17 15:38:10 +05:30
Edison Su
cdf10ccc2e
bug 13771: Long.equals is not ==
...
status 13771: resolved fixed
Reviewed-by: anthony
2012-02-16 17:02:55 -08:00
anthony
ae3c1966c1
bug 13712: do not download removed template
...
status 12712: resolved fixed
reviewed-by: edison
2012-02-14 18:32:28 -08:00
Edison Su
1ab89dd436
add cert chain in db, and also open the api to upload a cert chain
2012-02-09 14:56:40 -08:00
frank
aa9d250280
port copy template fix to acton
2012-02-09 14:19:08 -08:00
Nitin Mehta
d82fad81bf
Bug 13564: Incorrect format was coming for kvm since there was a ohardcoding on the extension to be of size 3 Instead take the format from the ENUM.
...
Reviewed-By: Kishan
2012-02-09 20:14:13 +05:30
prachi
05af078358
Bug 8791 - user dispersing allocator
...
Changes:
To migrate systems using 'use.user.concentrated.pod.allocation' as true and 'vm.allocation.algorithm' as true, we need to
add following changes:
- There will be 5 values to 'vm.allocation.algorithm': 'random', 'firstfit', 'userdispersing', 'userconcentratedpod_random', 'userconcentratedpod_firstfit'
- 'userconcentratedpod_random' means we apply user concentration to pods and clusters. To hosts and pools we use random ordering.
- 'userconcentratedpod_firstfit' means we apply user concentration to pods and clusters. To hosts and pools we use firstfit ordering.
2012-02-08 17:03:38 -08:00
Alena Prokharchyk
cad392cd68
bug 13335: fixed listProjectInvitations by projectId
...
status 13335: resolved fixed
2012-02-07 13:16:27 -08:00
frank
890bfffe2f
Bug 6849 - Randomize systemvm passwords (edit)
...
status 6849: resolved fixed
2012-02-03 17:28:58 -08:00
Alena Prokharchyk
1490e45a1c
Fixed format style in a bunch of files (replaced tabs with spaces as a part of it)
2012-02-03 13:49:11 -08:00
kishan
f1a30a21aa
Bug 13133: Added snapshot delete event when a recurring snapshot deletes oldest snap
...
Status 13133: resolved fixed
Reviewed-By: Nitin
2012-02-02 18:56:07 +05:30
Jessica Wang
46c0024a34
bug 13362: fix error message in StorageManagerImpl.java
2012-02-01 15:49:21 -08:00
Nitin Mehta
2ef6ed809f
Bug 11789: The calculation for storage allocated capacity would go through the the common function throught which dashboard calculates the capacity as well.
...
Reviewed-By: Prachi
2012-01-31 13:18:57 +05:30
Nitin Mehta
f88ddbe86e
Bug 13066: StorageOverProv-Start using bigdecimal for better precision. Change allocators and dashboard code for the same.
...
Status 12897: resolved fixed
Reviewed-By: Kishan
2012-01-30 17:27:30 +05:30
Edison Su
5e2f02fdd5
bug 13315: add httpproxy support in ssvm, only basic auth. User can add secstorage.proxy = http://username:password@hostname:port
...
status 13315: resolved fixed
2012-01-26 18:46:44 -08:00
anthony
3615b15c39
bug 13338:
...
increate timeout for sshcheck to 10 minutes
if sshcheck fails, finalizeCommandsOnStart fails, no exception
status 13338: resolved fixed
2012-01-26 12:22:24 -08:00
Alena Prokharchyk
79e9e292dd
bug 12571: fixed error message in createSnapshotPolicy
...
status 12571: resolved fixed
2012-01-20 14:31:38 -08:00
anthony
6297820981
bug 12830: propagate ISO to other zone on demand
...
status 12830: resolved fixed
2012-01-20 11:44:01 -08:00
anthony
bf490210ed
fixed a merge bug in checkin
...
cleanup snapshot in secondary storage in background
2012-01-19 20:52:18 -08:00
anthony
86aef08865
cleanup snapshot in secondary storage in background
...
Conflicts:
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
2012-01-19 20:44:44 -08:00
Kelven Yang
3612fc12c8
bug 11428: remove the constraint based on customer's feedback, we will allow creating volume from a snapshot that was originally taken from root volume. Customers should be aware that when the volume is attached as a data volume, some partitions that were originally created as a root volume may not be recognized by the guest OS
2012-01-17 16:10:20 -08:00
Alena Prokharchyk
83400cd15f
bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
...
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk
f0c4980dff
bug 13110: use Ternary data structure when build search criteria
...
status 13110: resolved fixed
2012-01-16 14:15:28 -08:00