etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,056 Commits 323 Branches 325 Tags 845 MiB
Commit Graph

282 Commits

Author SHA1 Message Date
Bharat Kumar 23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Koushik Das bc493bd39b CLOUDSTACK-672: Set VMware cluster max. limit based on HV version 
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
 2013-02-15 16:19:40 +05:30
Marcus Sorensen ae2b673e03 Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3 
BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360736064 -0700
 2013-02-12 23:16:22 -07:00
Kelven Yang 176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang 45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Kelven Yang 2be270de89 Separate loadable components like Gurus, Elements, Adapters to componentContext.xml 2013-01-16 16:33:59 -08:00
anthony a6b9027630 default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set 
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC

CLOUDSTACK-983: default Security rule doesn't apply to system VMs
 2013-01-15 11:15:42 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Chiradeep Vittal 5a830c4db0 Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager. 
NetworkManager's exclusive focus is now
 - handling plugins during orchestration, and
 - to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:01 -08:00
Alex Huang 0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Kelven Yang b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Kelven Yang d79f1f6fdc Replace Adapters and PluggableServices, use Spring to load them 2012-11-07 15:03:24 -08:00
Kelven Yang cea8f3bf37 Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation 2012-11-07 15:03:22 -08:00
Kelven Yang aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
Edison Su b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
Edison Su 513b680d96 CLOUDSTACK-316: if public network is not specified, set to guest network 2012-10-11 16:46:23 -07:00
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Koushik Das 3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
 2012-08-01 19:39:30 +05:30
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Edison Su 9a9c96df64 Patch fixes file names and imports wherever used, in files introduced in 
73be77a4c1
I've renamed discover to discoverer to fix the issue. My ant debug fails
with:
     [java] ERROR [utils.component.ComponentLocator] (main:) Unable to
load configuration for management-server from components.xml
     [java] com.cloud.utils.exception.CloudRuntimeException: Unable to
find class: com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer

RB: https://reviews.apache.org/r/6239/
Send-by: rohit.yadav@citrix.com
 2012-07-31 10:38:11 -07:00
Edison Su 73be77a4c1 add missing files 2012-07-30 16:00:45 -07:00
Edison Su 7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is 
created: cloud-kvm.jar
 2012-07-30 14:55:47 -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
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -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
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -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
Kelven Yang 9298e5d25d bug 15080: check traffic type in host discovery stage - cluster level checks 2012-06-06 16:54:16 -07:00
Kelven Yang d8d4232a7b bug : CS-15080 - check traffic label at host discovery stage also 2012-06-06 16:53:53 -07:00
Vijayendra Bhamidipati 90b87585e7 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack 
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep

Not sure why but changes in VmwareServerDiscoverer.java were not picked up
when cherry-picking from 3.0.x. Putting them in this separate commit.
 2012-05-25 19:50:50 -07:00
Sateesh Chodapuneedi 4ad8845b28 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack 
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
 2012-05-25 19:41:36 -07:00
Vijayendra Bhamidipati 15d0cf782a CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Removed the vcenter_dc_name and vcenter_ipaddr
	fields from the virtual_supervisor_module
	table, the CiscoNexusVSMDeviceVO, addClusterCmd,
	and all other references to these two fields.

	Fixing null pointer exceptions when checking
	for nexus related global parameter values in
	addClusterCmd.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
 2012-05-25 18:37:20 -07:00
Sateesh Chodapuneedi 49673d772b CS-14940 VSM access credentials are logged in clear text with Management-server.log 
Removed debug log after fetching the credentials.
 2012-05-25 18:04:33 -07:00
Sateesh Chodapuneedi 67bfe23d28 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Avoid detection of public traffic label for basic zones. Check switch types along with global parameter for enabling a particular vmware vswitch types. Move credentials information into resource and load during resource configuration. Cleanup.

Conflicts:

	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 2012-05-25 18:00:13 -07:00
Sateesh Chodapuneedi c65199cd8c CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Added VSM credentials to AddClusterCmd(optonal params only).
Cleanup.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
 2012-05-25 17:56:46 -07:00
Sateesh Chodapuneedi 9709774b4b CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Instance configuration to join distributed vNetwork.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
 2012-05-25 17:53:00 -07:00
Sateesh Chodapuneedi c59d5415ad CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Portprofile shaping policies will be fetched
	from nexus vswitch instead of vcenter.
	ACLs and Policies won't be synced to vCenter.
	Get physical network label while adding cluster.
	Cleanup.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-05-25 17:44:02 -07:00
Sateesh Chodapuneedi b6687faf89 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Retreving physical network configuration from
	database. Passing configuration down to resource.
	Cleanup.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 2012-05-25 17:40:38 -07:00
Sateesh Chodapuneedi 205f4a2192 CS-9919 - Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Code changes to manage Cisco Nexus 1000v in CloudStack.
	VmwareResource has been modified to leverage Nexus vSwitch.

	Providing following global configuration parameters,

vmware.use.nexus.vswitch -
	This would decide whether Nexus vSwitch in the VMware
	cluster environment would be used/managed by CloudStack
	for it's network infrastructure needs.

vmware.guest.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for guest traffic.

vmware.private.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

vmware.public.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

Functional Specification -
	http://wiki.cloudstack.org/display/RelOps/Cisco+Nexus+1000v+Support+in+CloudStack+-+Functional+Specification

Documentation / README for usage instructions -
	http://wiki.cloudstack.org/display/RelOps/Configuration+instructions+for+CloudStack+Deployment+with+Nexus+vSwitch

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
 2012-05-25 17:27:00 -07:00
anthony 224bf84f31 CS 14006: log fix 2012-05-21 11:46:04 -07:00
Pranav Saxena 28aaab4031 CS-14873 : Authentication errors 2012-05-14 11:13:39 -07:00
anthony 352f3d95ed add CentOS 6.0, CentOS 5.7, RHEL 5.7 support for XenServer 6.0.2 2012-04-23 13:57:59 -07:00
Sheng Yang 329b06087e CS-14542: Fix wrong traffic label for KVM agent 
Conflicts:

	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
 2012-04-19 18:29:36 -07:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Edison Su 1e4893b69c bug 1443: even adding host failed, return success in api. status 14443: resolved fixed; Reviewed-by: sheng 2012-03-23 18:23:10 -07:00
Abhi 90da4d1c92 bug 12947: support for 1.5 beta; reviewed-by: nitin 2012-03-22 17:30:56 +05:30
Kelven Yang 7c327ec658 bug 14188: always make sure to inject SSH keys before copying systemvm ISO to secondary storage 2012-03-21 14:24:52 -07:00
Abhi d354897780 bug 12947: enabling XCP 1.5 2012-03-21 10:23:04 +05:30
abhi 64eb2dfcb1 bug 14224: allowing Xenserver 6.0.2, with the assumption that the same patches and guest os type will work as with 6.0 2012-03-12 16:39:22 +05:30
abhi 87a32a4866 bug 14224: adding 6.0.2 2012-03-12 16:39:22 +05:30
Edison Su fe18cd5d7e bug 13845: as you can't add physical devices name from UI when you create zone, use kvm.{guest|public|private}.devices in the global configuration. 
status 13845: resolved fixed
Reviewed-by: frank
 2012-02-17 13:20:30 -08:00
Edison Su 20b9562432 bug 13781: reload host detail after host reconnect 
status 13781: resolved fixed
Reviewed-by: frank
 2012-02-15 18:54:50 -08:00
prachi dbe2305352 Bug 13099 table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings 
Changes:
- We do not need these global setting anymore. These will be hidden since 3.0
- The default traffic label will be picked from the global setting which is null by default. When traffic label is null it means the resource uses tag on the default gateway
- Changes to invoke discoverer to reload the resource object on host connection
- Since a zone can have many physical networks, there can be multiple guest, public networks. Only the zone wide storage and management traffic label will be stored in host_details henceforth.
- If traffic labels are updated, discoverer should update the host_details
 2012-02-07 18:41:23 -08:00
anthony a70ea7f745 bug 13241: before update cluste guid, check if this guid is used, 
status 13241: resolved fixed
 2012-02-03 17:01:04 -08:00
Kelven Yang cb959aa377 bug 13369: recycle roger hung worker VMs in vCenter 2012-01-30 14:21:56 -08:00
Chiradeep Vittal fcd90b269e allow Mac OS developers to run management server natively 2012-01-27 16:27:19 -08:00
Kelven Yang b1376e1f04 bug 13021: add a global configuration variable to let control default network adapter type inside system VMs 2012-01-12 14:21:11 -08:00
Edison Su fe667e949e fix Maintenance releated issues with kvm: 
1. put host into Maintenance, will send a Maintenance command to host, tell host that do not reconnect to mgt server
2. cancel Maintenance, will ssh into kvm host, and restart cloud-agent, which will reconnect to host
 2012-01-11 17:36:58 -08:00
Kelven Yang 6b8ff93330 Add storage network support at VMware resource 2012-01-09 16:44:23 -08:00
Kelven Yang bde008ed7e bug 12787: improve worker VM cleanup in snapshot operation 2012-01-06 19:15:29 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao 
status 12337: resolved fixed
reviewed-by: Abhi
 2011-12-20 19:28:41 +05:30
Edison Su da5fb5097c put the default network as cloudbr0, if not specified 2011-12-15 17:06:32 -08:00
kishan f3001534d5 log message before host resource is set. Otherwise log will show same resource as changed from and to 2011-12-13 16:35:21 +05:30
Abhinandan Prateek acdf26b267 bug 12005: java reflection was breaking due to parameter in the constructor 2011-12-12 10:00:29 +05:30
frank 3903503619 Bug 12404 - Failure in Removing host 
don't send PoolEjectCommand to host being deleted
 2011-12-07 14:38:41 -08:00
frank 494517cd6a Bug 12404 - Failure in Removing host 
status 12404: resolved fixed
 2011-12-07 14:04:50 -08:00
Edison Su 2e79da0ce5 kvm is working now 2011-12-05 18:07:00 -08:00
Kelven Yang a59658177d bug 11814: connect template and instance details data when sending command to resource 2011-11-18 16:40:31 -08:00
Alex Huang 84d5f0514e Changed network tags to network name as we no longer need to send the entire network tags down to the resource. 2011-11-18 14:28:16 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
prachi 5f93665a30 - Send network labels to hypervisor recource during processConnect 
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
 2011-11-04 17:57:05 -07:00
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
frank cef30956e9 Merge branch 'newagentmgr' 
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
 2011-10-27 11:09:56 -07:00
Abhinandan Prateek a1a0fdc0a3 bug 10588: making sure the vms are synced during a delta also 2011-10-27 15:56:53 +05:30
Kelven Yang fc3d93e3e7 bug 9614: let root volume use IDE disk controller by default to ensure backwards compatibility with existing CloudStack deployments 2011-10-24 15:28:51 -07:00
anthony 0df249172d Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM 2011-10-21 19:53:48 -07:00
Kelven Yang 443c175793 bug 9614: enable SCSI device controller for root disk.(default root disk controller type can be conifgured through global configuration) 2011-10-21 18:44:56 -07:00
David Nalley 06e9da180d Extending Kevin Brook's original XCP disguised as XS 5.6.100 patch 2011-10-19 22:41:33 -04:00
Abhinandan Prateek 81a9358eb7 bug 11675: enable RHEL 6 for XCP 1.1 2011-10-14 11:36:40 +05:30
anthony b3e6ab8d1c add support for XenServer 6.0.0 GA 2011-10-13 15:50:12 -07:00
Kelven Yang dce4e74b58 bug 11585: using pre-allocated NIC approach to support additional public interfaces for VMware 2011-10-11 15:40:31 -07:00
Abhinandan Prateek c6c5e8f557 bug 11675: fixed error messages 2011-10-11 17:23:12 +05:30
Abhinandan Prateek 930d0a0815 bug 11675: optimized the code 2011-10-11 16:46:15 +05:30
Abhinandan Prateek ceae8cd365 bug 11675: enabling support for XCP 1.1.0 2011-10-11 11:31:02 +05:30
frank 0f5384d086 Bug 11522 - New agent manager 
move findxxx interface from HostDao to Managers
 2011-10-06 11:56:17 -07:00
frank 89e04458b6 Bug 11522 - New agent manager 
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
 2011-10-04 14:35:26 -07:00
frank 683113cc38 Bug 11522 - New agent manager 
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
 2011-10-03 11:21:34 -07:00
anthony aef74ff521 bug 10579: disable pool vm sync and disable hostTrack for XenServer, 
status 10579: resolved fixed

reviewed-by: alex

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2011-09-28 12:41:24 -07:00
frank e5fca855c1 Bug 11522 - New agent manager 
register/unregister resource state adapter in configure/stop of implementations
 2011-09-27 11:51:03 -07:00
frank e8c13e10c7 Bug 11522 - New agent manager 
able to compile besides mycloud stuff
 2011-09-26 16:55:20 -07:00
Kelven Yang d32241ec9c bug 10971: support vSphere 5 2011-09-26 12:16:28 -07:00
frank e0e5491c42 Bug 11522 - New agent manager 
implements ResourceStateAdapter in a couple of components
 2011-09-23 11:28:02 -07:00