Tim Mackey
a8212d9ef4
Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
...
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:50:23 -04:00
Damodar Reddy
603eab751a
CLOUDSTACK-6701, CLOUDSTACK-6702:
...
1. Integrate System Seed Template into MSI Installer
2. Added progress bar status messages for custom actions at needed places.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-06-04 12:23:33 +05:30
Damodar Reddy
8a210b50fb
CLOUDSTACK-6702: Move all titles and descriptions to a property file or move to build properties
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-28 16:10:42 +05:30
Damodar Reddy
8f98cc304e
CLOUDSTACK-6700 : Give Option to install or not MySql Server along with Main Installer on the same server.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-23 16:25:38 +05:30
Min Chen
ba848087f8
Disable IAM feature from 4.4 release.
2014-05-22 18:27:08 -07:00
Damodar Reddy
61c765b230
CLOUDSTACK-6563: Integrating setuptools for python into MSI
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-20 14:57:44 +05:30
Damodar Reddy
aca7606a40
CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation
2014-05-16 10:50:32 +05:30
Alena Prokharchyk
961e2c43bc
CLOUDSTACK-6659: fixed the name for the updateIpAddress API command
2014-05-14 12:34:36 -07:00
Jessica Wang
7ae8dc8fbd
Revert "CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs"
...
This reverts commit 348fb7bcb6 .
2014-05-12 12:26:37 -07:00
Gabor Apati-Nagy
348fb7bcb6
CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs
2014-05-12 11:40:24 -07:00
Alena Prokharchyk
66d5ebc657
CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy
2014-05-07 15:46:18 -07:00
Milamber
1080de5d6d
Remove bad backslash near "label.nicira.nvp.details" key.
2014-05-04 15:32:27 +01:00
Milamber
90245ebe85
Update L10N resource files on master branch (with 4.4 translation strings)
2014-05-04 15:26:30 +01:00
Damodar Reddy
29b4fe6d9f
CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path
2014-04-29 14:44:03 +05:30
Laszlo Hornyak
fc68922286
Static resource compression
...
- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-28 21:10:18 +02:00
Damodar Reddy
881792991e
CLOUDSTACK-6271:[Windows] Integrating setup databases with msi installer for windows
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-04-28 16:46:26 +05:30
Gabor Apati-Nagy
156b08af5f
CLOUDSTACK-6255
...
UI for supporting region level VPC, distributed routing enabled VPC and
stretched L2 neworks
2014-04-24 15:05:59 -07:00
Koushik Das
b088821c61
CLOUDSTACK-6445: Simulator enhancements
...
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements
2014-04-18 16:44:21 +05:30
Mihaela Stoica
f3cf85bb62
CLOUDSTACK-6233: Add new tab "GPU" in Host detailView for gpu enabled hosts
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Signed-off-by: Sanjay Tripathi <sanjay.tripathi@citrix.com>
2014-04-16 16:09:41 +05:30
Damodar Reddy
54d3a3dc90
CLOUDSTACK-6410 : Maven Integration for windows Wix tool to create msi installer thropugh maven build process
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-04-16 11:07:10 +05:30
Brian Federle
e35bec515f
CLOUDSTACK-6342: UI changes for secondary IP on LB rules
...
This is front-end only; API call changes still need to be done.
2014-04-15 14:42:11 -07:00
Marcus Sorensen
11f5bdd78d
CLOUDSTACK-6191 Add support for specifying volume provisioning
...
type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
Mike Tutkowski
5e3d4aebac
CLOUDSTACK-6273 (Text changed slightly for a confirmation dialog)
2014-03-21 19:12:41 -06:00
Brian Federle
15729f342c
CLOUDSTACK-6272: Fix recover/restore VM actions
...
-Label recoverVirtualMachine as 'Recover VM'
-Label restoreVirtualMachine as 'Reinstall VM'
-Change confirmation text for restoreVirtualMachine to be more explicit
-Change restoreVirtualMachine icon to 'recycle' symbol, to avoid
confusion with the reboot VM icon
2014-03-21 13:28:52 -07:00
punith-cloudbyte
f3c7c607bd
cloudbyte storage plugin for master commit
2014-03-18 11:14:23 -07:00
Jessica Wang
dadaf85860
CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog.
2014-03-17 15:41:48 -07:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Prachi Damle
fa80c63c33
Removing the copy task that is not needed any more.
...
We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade
2014-03-13 14:14:12 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
amogh.vasekar
3ee1fc28de
CLOUDSTACK-6217:
...
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Mihaela Stoica
36558e4619
Corrected the value of label.no.grouping in the resource files. An extra backspace at the end of the string caused incorrect text to be shown in the Select view dropdown on Virtual Routers page: "(no grouping)\label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store" instead of "(no grouping)"
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-03-11 11:25:18 -07:00
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
vetrivelc
182c31899b
Externalized the hardcodedstrings from UI JAVASCRIPT files.
2014-03-05 14:11:51 -08:00
Gabor Apati-Nagy
477902379e
Fix CLOUDSTACK-4563: Initial zone wizard UI label issue
2014-03-03 10:19:03 -08:00
Hugo Trippaers
3beb75cdf1
Fix typo
2014-02-27 12:59:34 +01:00
Hugo Trippaers
a0f932437c
Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag
2014-02-27 09:51:02 +01:00
Min Chen
9f47466fea
Fix some issues in renaming iam api, also fix marvin library.
2014-02-26 17:30:34 -08:00
Konstantina Chremmou
f05fb9fb61
Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.
...
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 22:05:06 +01:00
Hugo Trippaers
afc188cb5c
Forward port the fix by David from 0c2ad0338e
2014-02-25 15:18:16 +01:00
Hugo Trippaers
7aa70fe82a
Fix jetty:run startup to include the mysql driver as a dependency for developers
2014-02-25 12:30:46 +01:00
Niels de Vos
c02197ae86
Add Gluster to the list of protocols in the Management Server
...
Gluster can now be used for Primary Storage just like NFS. This change adds the
Gluster protocol to the Management Server:
Infrastructure -> Primary Storage -> Add Primary Storage
And also add the option to create Primary Storage on Gluster when
following the 'Add Zone' wizard from:
Infrastructure -> Zones -> Add Zone
Some screenshots and verification:
- http://blog.nixpanic.net/2013/12/using-gluster-as-primary-storage-in.html
2014-02-25 12:08:46 +01:00
Hugo Trippaers
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
Hugo Trippaers
f1139848e5
Slight optimization, don't run checkstyle on container or non-java projects.
2014-02-18 12:24:11 +01:00
vetrivelc
e171cb181c
Fixed-Hardcoding-Issues
2014-02-14 07:44:54 -08:00
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Alena Prokharchyk
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08:00
Alena Prokharchyk
9641e1dbee
External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer
2014-02-05 10:36:21 -08:00
Syed Ahmed
356daf3eed
Review 16080 Move Netscaler plugin from non-oss to oss and upgrade the nitro API to 10.1
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-05 14:03:49 +01:00
Alex Huang
54f32a8e46
Moved the controlling logic for secondary storage vm into place
2014-02-05 01:39:17 +00:00
Alena Prokharchyk
aaa20947a9
ExternalUUID control support for Firewall and Egress Firewall rules
2014-02-04 17:06:04 -08:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Hiroaki KAWAI
cb048f4108
Some rework stratosphere ssp plugin
...
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
2014-01-30 21:31:44 +09:00
Min Chen
748dc1541c
Support attaching policy to account.
2014-01-28 10:00:17 -08:00
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Milamber
cb7b1dc276
Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
...
Conflicts:
client/WEB-INF/classes/resources/messages_es.properties
client/WEB-INF/classes/resources/messages_pt_BR.properties
2014-01-17 11:15:09 +00:00
Milamber
eb521baf49
Add Dutch (Netherlands) and Polish for UI languages
2014-01-17 11:14:52 +00:00
Alena Prokharchyk
bd79fb33a6
CLOUDSTACK-5870: API support for retrieving user data
2014-01-16 15:31:18 -08:00
Brian Federle
52406a8401
Rename 'Sockets' -> 'CPU Sockets'
2014-01-16 15:16:00 -08:00
Min Chen
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
Hugo Trippaers
b61f0a74ca
Centralize all eclipse m2e excludes in the main pom.xml
2014-01-14 09:39:42 +01:00
Min Chen
649d9d927f
CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
...
(updateCloudToUseObjectStore) instead of two APIs.
2014-01-08 17:25:13 -08:00
Hugo Trippaers
612a41e3f5
Add UI interface for managing the OpenDaylight provider and controllers.
...
Fix several bugs in the code related to the api handling.
Conflicts:
ui/scripts/system.js
ui
2014-01-08 17:08:37 +01:00
Hugo Trippaers
850bc9fa82
Hook the OpenDaylight plugin into CloudStack
2014-01-08 15:58:08 +01:00
Murali Reddy
3a6fcaf1fc
CLOUDSTACK-5787: support in-memroy eventbus
...
this checkin adds support for plug-in that provides an in memory event
bus which could be used as alternative to RabbitMQ based event bus. Both
publisher are subscriber should be running with management server to use
in-memroy event bus.
2014-01-06 13:24:36 +05:30
Nitin Mehta
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Min Chen
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2 .
2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Brian Federle
15a860d560
Add missing strings for LDAP section, S3 fields
2013-12-18 13:29:25 -08:00
Brian Federle
34174bbcbb
Add missing strings for quiesce VM, SMB fields
2013-12-18 13:10:15 -08:00
tuna
ccfe557329
delete old applicationContext
2013-12-10 11:49:10 +07:00
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
Will Stevens
c60a256ebd
fixed egress rules for palo alto plugin and cleaned up extra api calls on master
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-12-09 18:26:57 -08:00
tuna
61e80f030a
remove unused code
2013-12-09 23:33:15 +07:00
tuna
0624fe5d03
remove unused table: ovs_nic_map
2013-12-09 23:33:15 +07:00
tuna
3df8b912fc
add kvm support & LB service
2013-12-09 23:33:14 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Tuna
4e914b7087
re-factor gre controller
...
Signed-off-by: tuna <ng.tuna@gmail.com>
2013-12-09 23:33:14 +07:00
tuna
96188a3730
re-factor gre controller prototype
2013-12-09 23:33:14 +07:00
Jessica Wang
619f0a9c7f
UI > check in updated translation files for Siva Nata Sekhar Golla.
2013-12-05 16:55:48 -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
Jan-Arve Nygård
de2c4ceeb9
Fixed typo
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 14:16:25 +01:00
Wei Zhou
8b237eb0a2
CLOUDSTACK-4505: allow domain admin to expunge a destroyed VM
2013-11-26 15:02:44 +01: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
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
Rajani Karuturi
917ea33ba9
added LDAP group name label in add account wizard
...
changed the parameter for domain in api importLdapUser from name to UUID
improved error handling
2013-11-20 13:57:41 +01:00
Damodar Reddy
67fc2f53e2
CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue)
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-14 11:10:48 +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
Abhinandan Prateek
07b68742c9
CLOUDSTACK-4916: removing spurious comments
2013-11-08 16:44:32 +05:30
Damodar Reddy
dcd3c44279
CLOUDSTACK-4916: To Enable Master High Availability using mysql connector params and mysql's 2 way replication
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-08 16:18:14 +05:30
Wei Zhou
57ba367f3c
CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec479)
2013-11-08 09:00:29 +01: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
Mike Tutkowski
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
Will Stevens
8f8ad3f38e
Squashed commit of the Palo Alto Networks firewall integration plugin.
...
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).
More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration
Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)
Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-11-06 10:08:22 -08:00
Min Chen
ce3638bb03
Merge branch 'master' into rbac.
2013-11-04 15:49:29 -08:00
chriscameronv
5ccf3a90ab
switch label for VLAN to VLAN/VNI
2013-11-04 14:25:01 -08:00
Devdeep Singh
a196fbc836
Application context files so that hyperv guru and discoverer can be loaded. Also made changes
...
to hyperv pom.xml to make sure the resources are picked up at build time.
2013-11-04 18:48:54 +05:30
Donal Lafferty
f9f196a46a
A plugin for Hyper-V control is available for CloudStack. The plugin implements basic VM control; however, its
...
architecture allows additional functionality to be easily added. Incorporating the plugin in CloudStack will allow
the community to participate in improving the features available with Hyper-V. The plugin uses a Director Connect
Agent architecture described here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Progress
Add ability to pass kvp data via the key cloudstack-vm-userdata
Rearrange code to make it clearer what .NET objects are being used.
Test failures are easier to deal with if test key is not deleted.
Acquire management/pod ip for control ip when VR deploys in HyperV
Fixed deletion on VM's on hyperv host when mgmt server gets restarted due to HA
Implementation for attach iso command. Attaches an iso to a given vm.
2013-11-04 18:48:53 +05:30
Pedro Marques
6b5fab2f5c
OpenContrail network plugin
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-11-01 17:46:52 +01:00
Min Chen
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00