Adrian Cole
debabe632f
cloudservers-uk now has ubuntu 8.04
2011-11-01 04:20:30 +00:00
Adrian Cole
700e191536
updated to latest elastichost image ids
2011-11-01 04:19:35 +00:00
Adrian Cole
5d252e6fd5
removed throws clauses to UnsupportedEncodingException where they aren't thrown
2011-10-28 15:00:56 +02:00
Adrian Cole
dd89ad3068
backfilled tests and refactored most of org.jclouds.location.suppliers package
2011-10-23 04:38:25 +02:00
Adrian Cole
03da9402b8
test that we match ubuntu precise in aws-ec2
2011-10-17 21:39:53 -07:00
Adrian Cole
e94f237514
Issue 727:enable ubuntu Natty on cloudsigma-zrh
2011-10-17 19:55:47 -07:00
Adrian Cole
552242e863
moved to 1.3.0-SNAPSHOT
2011-10-16 12:26:31 -07:00
Adrian Cole
90c85e03f9
updated iso codes
2011-10-16 09:21:47 -07:00
Adrian Cole
0c14365399
Harder tests relating to installing admin user
2011-10-16 03:08:36 -07:00
Adrian Cole
7cc010e449
better error message when out of IPs
2011-10-16 03:06:13 -07:00
Adrian Cole
2ba6ce6b66
precise
2011-10-16 03:01:43 -07:00
Adrian Cole
738c507b20
11.04 ssh image has auth errors in cloudsigma-zrh
2011-10-16 02:54:57 -07:00
Adrian Cole
2d704bde59
Issue 724:add ubuntu precise to the supported versions
2011-10-16 02:50:45 -07:00
Adrian Cole
bf584390e0
adjusted test properties
2011-10-15 17:42:48 -07:00
Adrian Cole
ed47d255b0
Issue 612: added Name support to aws-ec2
2011-10-15 00:26:54 -07:00
Adrian Cole
921dae7395
moved ec2 image parsing notices out of the compute logger
2011-10-15 00:25:01 -07:00
Adrian Cole
df8fbd7eca
adjusted as softlayer doesn't support metadata
2011-10-15 00:24:13 -07:00
Adrian Cole
5316cbc71c
bumped up SoftLayer timeouts
2011-10-14 22:52:07 -07:00
Adrian Cole
921ca628f7
Issue 722: added specific tests to help troubleshoot GoGrid api issues
2011-10-14 15:50:38 -07:00
Adrian Cole
9018bdafa2
ec2 test stabilization
2011-10-14 10:40:01 -07:00
Adrian Cole
a6d481f88a
changed to use spot instances in us-west-1 due to connect failures trying to ssh across the atlantic
2011-10-14 02:36:28 -07:00
Adrian Cole
9104eca282
Issue 717: corrected keyPair state logic which was redundantly creating keys
2011-10-14 01:49:18 -07:00
Adrian Cole
7e5a6e68cf
Issue 719: add sha1 support to SshKeys
2011-10-13 23:57:46 -07:00
Adrian Cole
7278582730
log more details when creating keys
2011-10-13 02:09:13 -07:00
Adrian Cole
c28a2e38c3
Issue 719: added some logging for ssh fingerprints
2011-10-13 01:49:49 -07:00
Adrian Cole
0e9d3666ad
Merge pull request #108 from jsonking/master
...
SoftLayer: Added Regions to Datacenter (for dasein). Fixed tests for Amsterdam DC and region info.
2011-10-12 08:17:38 -07:00
Jason King
a1917a727c
SoftLayer: Added Regions to Datacenter (for dasein). Fixed tests for Amsterdam DC and region info.
2011-10-12 11:05:09 +01:00
Adrian Cole
2642882f03
Issue 718:update to latest amazon linux
2011-10-11 17:52:58 -07:00
Adrian Cole
326328b71b
spot requests are not opening in us-east-1 or us-west-1: switching to eu-west-1
2011-10-11 17:12:46 -07:00
Adrian Cole
0dbf453dd0
updated image test count
2011-10-11 16:59:42 -07:00
Andrew Donald Kennedy
e997ae4d55
612: The tagSet is not cleared between instances when parsing XML responses
2011-10-11 19:58:49 +01:00
Jason King
a05e2d55c2
Cloudsigma: Fixed documentation links, plus LiveTest for rename a VLAN which works now
2011-10-11 17:48:45 +01:00
Adrian Cole
bbbd5a35fc
Issue 690:Update to guava 10.0.1
2011-10-10 18:00:07 -07:00
Andrew Donald Kennedy
5b91b20d07
612: Change in predicate to equalTo
2011-10-10 17:11:35 +01:00
Andrew Donald Kennedy
83aae3fe08
612: Treat empty-valued tags differently on running instance node metadata
2011-10-10 17:11:34 +01:00
Andrew Donald Kennedy
f306137eb0
612: Added testing of tags for instances and checking for empty key values
2011-10-10 17:11:34 +01:00
Adrian Cole
842da34982
Issue 713:support userMetadata in createNodesInGroup in byon, cloudservers, and aws-ec2
2011-10-07 00:34:44 -07:00
Adrian Cole
031ee4bee5
Merge pull request #95 from grkvlt/master
...
Issue 612: Implement TagClient and TagAsyncClient
2011-10-06 19:15:37 -07:00
Adrian Cole
809a1b051c
Issue 712:add support for CloudSigma Las Vegas
2011-10-06 18:59:23 -07:00
Andrew Donald Kennedy
410b947160
612: Change Multimap occurences to Maps with Iterable values
2011-10-07 01:13:35 +01:00
Andrew Donald Kennedy
d4f7140071
612: Changed Tag filters to use Multimap and Collection to Iterable
2011-10-07 01:11:51 +01:00
Andrew Donald Kennedy
e30f0f626e
612: Added required classes and tests to support CreateTags, DeleteTags and DescribeTags for TagClient and TagAsyncClient
2011-10-07 01:11:50 +01:00
Jason King
03f3f9562f
Issue 158: Fixed regex for finding the cpuitem, decoupled from value used to order it+tests
2011-10-06 15:01:02 +01:00
Adrian Cole
b22a0239c2
Issue 158: softlayer support
2011-10-04 02:30:53 -07:00
Adrian Cole
f326be00f8
ec2 test stabilization
2011-10-04 02:21:51 -07:00
Adrian Cole
ec7a736771
updated eucalyptus tests
2011-09-30 22:38:25 -07:00
Adrian Cole
89c47ed6dd
fixed location for openhosting to FL, not VA
2011-09-29 10:10:30 -07:00
Adrian Cole
c3b94378e8
Issue 669: update openhosting to elasticstack 2.0
2011-09-28 13:28:42 -07:00
Adrian Cole
a79190e86a
Issue 645: move go2cloud out of sandbox
2011-09-27 13:12:59 -07:00
Adrian Cole
81796319aa
Issue 664: remove bluelock vcenterprise environment
2011-09-26 01:13:26 -07:00
Adrian Cole
d5a6950864
updated to latest gogrid images
2011-09-25 14:31:26 -07:00
Adrian Cole
6ad732cda7
Issue 693:add ability to supply node object directly to byon
2011-09-22 13:09:45 -07:00
Adrian Cole
b0e2dccd43
Issue 692: cloudsigma nodes working with ubuntu 10.04
2011-09-22 10:41:19 -07:00
Adrian Cole
b4e4c26f44
fixed ec2 regressions related mapmaker -> cachebuilder
2011-09-22 02:29:14 -07:00
Adrian Cole
d4323d1ffd
updated centos versions
2011-09-22 00:42:43 -07:00
Adrian Cole
4cd94489c9
Issue 690:Update to guava 10.0rc2 and change from MapMaker to CacheBuilder
2011-09-22 00:23:29 -07:00
Adrian Cole
d039fe7d96
Issue 692:CloudSigma ssh password support
2011-09-22 00:20:17 -07:00
Adrian Cole
982e92fe9f
Issue 334: changed AWSEC2ComputeServiceLiveTest.testExtendedOptionsAndLogin to use aws-cloudwatch
2011-09-16 16:05:37 -07:00
Adrian Cole
e766248327
Issue 334: added aws-cloudwatch provider
2011-09-16 15:36:29 -07:00
Guillaume Nodet
87dd23551c
Avoid using a non official jsr and use our own annotations
2011-09-16 17:52:12 +02:00
Adrian Cole
0c91e3ae37
Issue 669: fixed test properties for elasticstack 2.0 providers
2011-09-12 18:54:58 -07:00
Adrian Cole
952e58e74d
Merge branch 'issue-669' of https://github.com/mattiasholmqvist/jclouds
...
* 'issue-669' of https://github.com/mattiasholmqvist/jclouds :
Read "smp:cores" instead of "smp"
Intermediate fix that fixes vnc:ip and nic:0:dhcp:ip for new API version of ElasticStack. Still some issues left to fix due to hanging tests.
2011-09-08 16:25:50 +02:00
Adrian Cole
bedfee376a
Issue 659:Specify non-default key pair for boot script in EC2
2011-09-07 11:50:31 +02:00
Mattias Holmqvist
78511b74f3
Intermediate fix that fixes vnc:ip and nic:0:dhcp:ip for new API version of ElasticStack. Still some issues left to fix due to hanging tests.
2011-09-06 23:16:38 +02:00
Adrian Cole
b20cc16693
Issue 677:Race in authorizeGroupToItself and node launch
2011-09-02 13:43:57 -07:00
Adrian Cole
960bfe709f
Issue 663:Update license headers to jclouds, Inc. and setup NOTICE file
2011-08-16 18:14:30 -07:00
Adrian Cole
648d2f4236
Issue 662:ec2 ami query syntax from < 1.1.0 doesn't work on >= 1.1.0
2011-08-16 11:12:34 -07:00
Adrian Cole
ccb3d84133
Issue 660:null group on nodes from aws-ec2 provider
2011-08-16 09:26:25 -07:00
Adrian Cole
0a8f38b90e
bumped snapshot version to 1.2.0-SNAPSHOT
2011-08-05 04:09:23 +01:00
Adrian Cole
2b28c04c0f
Issue 539:expose templatebuilder parameter to prefer s3-backed images
2011-08-04 11:25:49 +02:00
Adrian Cole
8a2cbe1be5
run cloudonestorage tests one at a time to reduce bandwidth needed
2011-08-04 11:25:17 +02:00
Adrian Cole
0dfecb0a47
stabilizing vcloud tests
2011-08-04 11:24:46 +02:00
Adrian Cole
e2397d6302
stabilize vcloud-based providers for 1.1.0 release
2011-08-03 10:13:54 -07:00
Adrian Cole
6fe74edcae
stablalize cloud load balancers tests as they take longer now
2011-07-29 14:20:52 -07:00
Adrian Cole
3a15bbd1ca
Issue 650:remove bluelock-vcdirector provider
2011-07-29 14:03:58 -07:00
Adrian Cole
c424edbda9
Issue 645: go2cloud uses a elasticstack2 which we don't yet support
2011-07-29 13:44:03 -07:00
Adrian Cole
3e15445297
made euca single threaded so that we don't use so many buckets
2011-07-29 13:33:45 -07:00
Adrian Cole
8e7ec82322
fixed template ids for live test
2011-07-29 10:54:49 -07:00
Adrian Cole
841b9aae1b
fixed security group test
2011-07-29 03:47:49 -07:00
Adrian Cole
a26c568d7b
Issue 606:add ability to authorize ec2 ingress rules by source group constrained by port range
2011-07-29 03:41:20 -07:00
Adrian Cole
a802c2adf5
stabilized cloudfiles tests
2011-07-28 22:15:06 -07:00
Adrian Cole
79a2646415
stabilization of tests for swift/cloudfiles
2011-07-28 12:06:28 -07:00
Adrian Cole
32fe309424
Issue 639:Memory scaling for GoGrid vm's
2011-07-28 01:37:53 -07:00
Adrian Cole
6ff1738e8a
Issue 645:support Go2Cloud Johannesburg
2011-07-28 01:37:26 -07:00
Adrian Cole
85a6e2f90f
Issue 644:update standard image list for elastichosts
2011-07-28 00:37:14 -07:00
Adrian Cole
f38241efca
fixed Bluelock tests
2011-07-26 22:16:52 -07:00
Adrian Cole
a6351972d4
better error on gogrid test
2011-07-26 22:16:52 -07:00
Adrian Cole
edc1b10610
Issue 637: moved to sshj and tested on aws-ec2 gogrid cloudservers elastichosts-lon-p trmk-*
2011-07-25 03:59:01 -07:00
Adrian Cole
732491fe17
Issue 636: hone ssh code config + tests to make it easier to isolate cause of stderr hang
2011-07-25 03:10:55 -07:00
Adrian Cole
6f6b11c45a
revised terremark implementation to only include the minimum vCloud vocabulary it needs
2011-07-24 21:39:23 +10:00
Adrian Cole
81bf7268be
Issue 487: rimu returns consistent hostname, but vcloud does not
2011-07-23 23:20:13 +10:00
Adrian Cole
c9e63f98ab
corrected default network pattern for bluelock
2011-07-23 17:50:11 +10:00
Adrian Cole
d5caa414b1
Issue 634: repackaged trmk-common into org.jclouds.trmk.vcloud_0_8; trmk-ecloud into org.jclouds.trmk.ecloud; trmk-vcloudexpress into org.jclouds.trmk.vcloudexpress
2011-07-23 13:16:23 +10:00
Adrian Cole
323e775a08
Issue 634: folded vcloud-common into vcloud and trmk-common
2011-07-23 12:06:04 +10:00
Adrian Cole
a365e7de2c
Issue 634: fold vcloudexpress into trmk-common
2011-07-23 11:00:00 +10:00
Adrian Cole
5994d14841
Issue 487: gogrid and elasticstack do not have predicatable hostnames
2011-07-23 10:19:51 +10:00
Adrian Cole
6928082674
Issue 487:Add hostname property to nodemetadata
2011-07-22 21:21:33 +10:00
Adrian Cole
acd4b4a628
clean up style warnings
2011-07-22 12:48:59 +10:00
Adrian Cole
0f9dd50d7d
Issue 628:expose properties to choose default Org and vDC in vCloud-based implementations
2011-07-22 11:03:29 +10:00
Adrian Cole
c1ae4d06e6
update amazon template to reflect current images
2011-07-22 10:46:40 +10:00
Adrian Cole
6662614023
update slicehost default template properties
2011-07-22 10:46:09 +10:00
Adrian Cole
feaef2b6eb
work around condition where occasionally gogrid is late making credentials available for a newly started server
2011-07-22 10:45:26 +10:00
Adrian Cole
f3a0e6d0bd
Issue 632:enhance and automatically work around nodes with sftp problems
2011-07-22 10:41:43 +10:00
Adrian Cole
f81bb95ab0
Issue 542: updated terremark eCloud implementation to 2.8 version of Org and added Tag and DataCenter queries
2011-07-17 18:44:44 +10:00
Adrian Cole
46c7822b4a
Issue 624:update terremark config to use ubuntu 10.04 templates
2011-07-12 20:53:06 -07:00
spasam
d9b9c61ce6
Implented vApp tag support for Terremark Enterprise.
...
Also added configurable exponential delay between automatic retries.
2011-07-12 11:21:20 -04:00
Adrian Cole
6e2cf793b2
Issue 613:Automatically parse cluster ami list
2011-07-08 02:13:12 -07:00
Adrian Cole
3c200645bc
added ec2 support for image filters
2011-07-08 02:13:12 -07:00
Adrian Cole
537691226e
added hypervisor property to ec2 image
2011-07-08 02:13:12 -07:00
Adrian Cole
c8ebbc2f02
updated cloudservers uk template settings to match current images
2011-07-08 02:13:12 -07:00
Adrian Cole
b037be29fa
updated rackspace default version to ubuntu 11.04
2011-07-08 02:13:11 -07:00
Adrian Cole
0e8385aa83
Issue 610: greenhouse data now passes
2011-07-07 01:06:45 -07:00
Adrian Cole
17545cca29
fixed credential persistence in gogrid
2011-07-07 01:06:01 -07:00
Adrian Cole
48fa7a6d2c
Issue 620:elasticstack and cloudsigma-based providers do not report operating system on nodes
2011-07-07 01:01:35 -07:00
Adrian Cole
c4c40eaff5
Issue 619:support parsing ubuntu oneiric
2011-07-05 22:52:45 -07:00
Adrian Cole
fae29d217e
Issue 617:address NPE failures in CI
2011-07-05 14:36:49 -07:00
Adrian Cole
7ad9fddf52
Issue 608:Starting a node with a location-id specifying an ec2 availability zone fails
2011-07-04 22:03:55 -07:00
Adrian Cole
0a28bbdb8a
cloudservers now supports debian
2011-07-01 17:38:35 -07:00
Adrian Cole
b1e5bb6ade
Issue 610: greenhousedata-element-vcloud now out of sandbox
2011-07-01 16:26:11 -07:00
Adrian Cole
750be3137d
Issue 608: investigate template where EC2 AZ is specified explicitly leaves ami with correct region code
2011-06-28 11:46:16 -07:00
Adrian Cole
b468d3b047
Issue 608: investigate template where EC2 AZ is specified explicitly
2011-06-28 11:43:27 -07:00
Adrian Cole
96a4923c4c
added message and null check guarding MPU on payloads with contentLength set
2011-06-27 07:11:10 -07:00
Adrian Cole
0502300840
fixed ec2 security group live test
2011-06-27 02:26:51 -07:00
Adrian Cole
3e80c0433c
osgi fix
2011-06-24 18:44:16 +08:00
Andrew Phillips
7d2fb23119
Master version is now 1.1.0-SNAPSHOT (= next feature version) now that 1.0.0 is out
2011-06-05 11:17:43 +04:00
Adrian Cole
ce13a863a9
Issue 550: added PM for cloudsigma
2011-06-03 02:35:12 -07:00
Adrian Cole
9257f3a1e6
fixed typo
2011-06-03 02:06:52 -07:00
Adrian Cole
6a8f52e210
Merge branch 'master' of git@github.com:jclouds/jclouds
...
* 'master' of git@github.com:jclouds/jclouds:
Cleaning up API for ebs2 and elastic-ip2 after review. Minor changes to doc-strings, code formatting and order of args in release fn.
Issue 550: Global ATMOS refactoring for identity.
Issue 550: Added ProviderMetadata for Ninefold Storage.
Issue 550: Added ProviderMetadata for OpenHosting East1 provider.
Issue 550: Addressed the verbiage used for credentials for the synaptic-storage provider.
Issue 550: Cleaned up a few minor formatting nits and implemented linked services for Eucalyptus.
Issue 550: Added ProviderMetadata for AT&T Synaptic Storage.
cleanup and refine vmclientlivetest
added test dependency
added providermetadata test for savvis-symphonyvpdc
cleanup tests, added ProviderMetadata implementation for savis-symphonyvpdc
fixed firewallservice url
cleanup
fixed tests for savvis
Fixed typo
First version of elastic_ip2.clj
First version of ebs2.clj
2011-06-03 01:12:38 -07:00
Kedar Dave
7368b68a1e
Merge branch 'master' of git://github.com/jclouds/jclouds
2011-06-03 02:21:51 -05:00
Jeremy Whitlock
770023a892
Issue 550: Global ATMOS refactoring for identity.
...
[in providers]
* cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java,
synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java
(getIdentityName): Changed "Subtenant ID" to "Subtenant ID (UID)".
2011-06-03 00:50:28 -06:00
Jeremy Whitlock
1340e38728
Issue 550: Added ProviderMetadata for Ninefold Storage.
...
[in providers/ninefold-storage/src]
* main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java,
main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata,
test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java: Added.
2011-06-03 00:48:20 -06:00
Jeremy Whitlock
e0bb0bc4d7
Issue 550: Added ProviderMetadata for OpenHosting East1 provider.
...
[in jclouds/openhosting-east1/src]
* main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java,
main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata,
test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java: Added.
2011-06-03 00:33:37 -06:00
Jeremy Whitlock
691e69a961
Issue 550: Addressed the verbiage used for credentials for the synaptic-storage provider.
...
[in providers/synaptic-storage/src]
* main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java
(getIdentityName, getCredentialName): Updated to use ATMOS verbiage per Adrian's feedback.
2011-06-03 00:11:14 -06:00
Jeremy Whitlock
63cd9d0535
Issue 550: Cleaned up a few minor formatting nits and implemented linked services for Eucalyptus.
...
[in providers]
* aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java: Fixed a javadoc link.
* aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java: Fixed a javadoc link
and fixed an erroneous full-qualified class reference.
* eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java,
eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
(getLinkedServices): Implemented.
2011-06-03 00:06:38 -06:00
Jeremy Whitlock
17db25cceb
Issue 550: Added ProviderMetadata for AT&T Synaptic Storage.
...
[in providers/synaptic-storage/src]
* main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java,
src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata,
src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java: Added.
2011-06-02 23:58:50 -06:00
Kedar Dave
31df3c48b0
Merge branch 'master' of github.com:kedardave/jclouds
2011-06-03 00:47:05 -05:00
Kedar Dave
c8bbe64403
cleanup and refine vmclientlivetest
2011-06-03 00:16:36 -05:00
Adrian Cole
4bc2a2997b
Merge branch 'master' of git@github.com:jclouds/jclouds
...
* 'master' of git@github.com:jclouds/jclouds:
Issue 594: move google storage back to sandbox
2011-06-02 21:47:48 -07:00
Adrian Cole
161906b98d
updated standard drives for skalicloud
2011-06-02 21:27:37 -07:00
Adrian Cole
424184c380
Issue 594: move google storage back to sandbox
2011-06-02 20:32:03 -07:00
Kedar Dave
cfe91f9817
added test dependency
2011-06-02 22:25:34 -05:00
Adrian Cole
9ef411d39a
added debian 6 to bluesquare
2011-06-02 19:57:55 -07:00
Adrian Cole
fc2c59d861
Merge pull request #51 from gustavomzw/master
...
Issue 550: Added ProviderMetadata for Elastic Hosts.
2011-06-02 19:33:29 -07:00
Gustavo Morozowski
226efe0659
Issue 550: Added ProviderMetaData for RimuHosting.
2011-06-02 23:20:38 -03:00
Gustavo Morozowski
d313950f38
Issue 550: Added ProviderMetaData for SkaliCloud.
2011-06-02 22:57:07 -03:00
Gustavo Morozowski
14bfc83d69
Issue 550: Added ProviderMetaData for Serverlove.
2011-06-02 22:28:40 -03:00
Gustavo Morozowski
c1b7ffb624
Issue 550: Small fixes to Elastic Hosts.
2011-06-02 22:06:26 -03:00
Gustavo Morozowski
00c55bcdfa
Issue 550: Added ProviderMetadata for Elastic Hosts.
2011-06-02 21:40:33 -03:00
Adrian Cole
5b10d5d0f8
Merge branch 'master' of https://github.com/dmitri-b/jclouds
...
* 'master' of https://github.com/dmitri-b/jclouds :
non-working live tests is disabled (they are not working due to the issues with OpenStack)
non-working live tests is disabled (they are not working due to the issues with OpenStack)
incorrect imports fix
comments for failing live tests fixes in change password test
more fixes in live tests more debug logging
timeout for tests is increased
live tests bug fixes
comments for JschSshClinet bug fix
JschSshClinet bug fix for exec method
key file for live tests is renamed
additional json test is moved to apis/nova
additional json test
keys for live tests are loaded from the classpath
2011-06-02 17:08:29 -07:00
Adrian Cole
461f49622d
moved scality rs2 services into sandbox due to service problems
2011-06-02 16:52:28 -07:00