Commit Graph

757 Commits

Author SHA1 Message Date
Paul Hinze 514a5b9684 Merge pull request #1378 from bobtfish/better_doc_math
Document the fix to GH-1068 on the website
2015-04-06 11:00:08 -05:00
Travis Truman 2a387725fa Correcting a minor spelling mistake 2015-04-03 17:38:42 -04:00
Nick HS 39598cf1fa Rename False to false in aws_db_instance
False isn't allowed in hcl, just fixing a typo
2015-04-03 15:19:41 -04:00
Nick HS 95270bf68d Change example name in aws_db_paramater_group res
AWS DB Paramater Groups cannot contain underscores, see
http://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-CreateDBParameterGroup.html
2015-04-03 15:16:13 -04:00
Tomas Doran 2dfb837974 Document the fix to GH-1068 on the website 2015-04-03 15:51:12 +01:00
Jack Pearkes ccb6cefca9 website: fix openstack doc links and style 2015-04-02 21:08:42 -07:00
Mitchell Hashimoto 8577fd466c website: update middleman dep 2015-04-02 11:29:46 -07:00
Mitchell Hashimoto 2055405d2f website: fix markdown syntax errors 2015-04-02 11:19:27 -07:00
Jason Waldrip f77250f17d block device support for launch configurations
- mimics block device support from AWS instance
 - splits the acceptance tests out so they all pass, handling a FIXME
   from #1079
2015-04-02 12:34:13 -05:00
Paul Hinze 737ecb3c31 Merge pull request #1363 from jtopjian/openstack-doc-updates
provider/openstack: documentation updates
2015-04-02 11:43:32 -05:00
Joe Topjian c6a8849725 OpenStack Documentation Updates 2015-04-02 16:12:18 +00:00
Hart Hoover 3fcaab9114 Fix(docs) Correct spelling error in Docker documentation 2015-04-02 10:43:40 -05:00
Rui Zhang 94bb3ed513 Support for AWS Placement Group
- add placement_group for aws instance
- update test and document
2015-04-01 23:33:16 -07:00
Tarrant f68c9eee63 Merge branch 'master' of https://github.com/hashicorp/terraform 2015-04-01 18:24:57 -07:00
Ryan Uber 854267fb0e Merge pull request #1355 from hashicorp/f-plan-exitcode
Granular exit code during terraform plan
2015-04-01 16:21:01 -07:00
Clint Shryock 261faaf3d2 Merge branch 'master' into f-rds-update
* master: (167 commits)
  return error if failed to set tags on Route 53 zone
  core: [tests] fix order dependent test
  Fix hashcode for ASG test
  provider/aws: Fix issue with tainted ASG groups failing to re-create
  Don't error when reading s3 bucket with no tags
  Avoid panics when DBName is not set
  Add floating IP association in aceptance tests
  Use env var OS_POOL_NAME as default for pool attribute
  providers/heroku: Add heroku-postgres to example
  docs: resource addressing
  providers/heroku: Document environment variables
  providers/heroku: Add region to example
  Bugfix on floating IP assignment
  Update CHANGELOG.md
  update CHANGELOG
  website: note on docker
  core: formalize resource addressing
  core: fill out context tests for targeted ops
  core: docs for targeted operations
  core: targeted operations
  ...
2015-04-01 15:28:35 -05:00
Ryan Uber 4df04e0878 website: document detailed exit codes for plan 2015-04-01 09:49:36 -07:00
Paul Hinze 5b699fea9e Merge pull request #1293 from hashicorp/f-targeted-ops
core: targeted operations
2015-04-01 10:37:55 -05:00
Justin Campbell 9b3826cf36 providers/heroku: Add heroku-postgres to example 2015-03-31 18:48:09 -07:00
Tarrant 6ad812e3d8 Merge branch 'ssh_agent' 2015-03-31 17:49:55 -07:00
Paul Hinze 91a3d22a9f docs: resource addressing 2015-03-31 18:48:54 -05:00
Justin Campbell 6d3425f961 providers/heroku: Document environment variables 2015-03-31 15:51:22 -07:00
Justin Campbell ad19adfdc0 providers/heroku: Add region to example
...since it's required
2015-03-31 15:50:57 -07:00
Paul Hinze 08814a51ba Merge pull request #924 from jrperritt/openstack-gophercloud-v1.0
OpenStack Provider
2015-03-31 16:58:21 -05:00
Mitchell Hashimoto 596511078a website: note on docker 2015-03-31 14:48:57 -07:00
Paul Hinze 23d005b0e8 core: docs for targeted operations 2015-03-31 14:49:38 -05:00
Long Nguyen 42fb14f19a Added self option to security groups 2015-03-31 09:54:49 -06:00
Joe Topjian 2b152f38b2 Doc update for instance volume attachment. 2015-03-31 09:54:48 -06:00
Joe Topjian 768292c069 Support for flavor_name
This commit renames flavor_ref to flavor_id and adds the flavor_name
parameter. Users can now specify either a flavor ID or name when launching
instances.
2015-03-31 09:54:48 -06:00
Joe Topjian 52102624c6 More doc touchups 2015-03-31 09:54:48 -06:00
Joe Topjian 6f8df3d34e Doc touchup 2015-03-31 09:54:48 -06:00
Joe Topjian 2b5c7c6e2c Updated documentation to reflect the image_ref / image_id change. 2015-03-31 09:54:48 -06:00
Jon Perritt 436ef9e53b boot from volume ops and docs 2015-03-31 09:54:48 -06:00
Jon Perritt 9c128b7c99 docs for volume and container resources 2015-03-31 09:54:48 -06:00
Jon Perritt 3427597bd0 update docs to remove security group rule and lb member files 2015-03-31 09:54:47 -06:00
Jon Perritt 7cdb790ece update compute intance docs: 'networks -> 'network' 2015-03-31 09:54:47 -06:00
Jon Perritt d80a02c12d update docs to reflect resource region and versioning 2015-03-31 09:54:46 -06:00
Jon Perritt f4a22ae47f add neutron and lb resources 2015-03-31 09:54:46 -06:00
Jon Perritt bf92b1647f fix typo 2015-03-31 09:54:46 -06:00
Jon Perritt 2a4570e382 add comment for changing 'networks' attribute 2015-03-31 09:54:46 -06:00
Jon Perritt 8e6e7909cb neutron subnet operations 2015-03-31 09:54:46 -06:00
Jon Perritt ef3ee11045 neutron network operations 2015-03-31 09:54:46 -06:00
Jon Perritt c2230a8aaa lb vip operations 2015-03-31 09:54:46 -06:00
Jon Perritt 7132b02a84 lb pool operations 2015-03-31 09:54:45 -06:00
Jon Perritt 966c8420d1 lb monitor operations 2015-03-31 09:54:45 -06:00
Jon Perritt 9077b66045 lb member operations 2015-03-31 09:54:45 -06:00
Jon Perritt fc344e9060 sec group and sec group rule docs 2015-03-31 09:54:45 -06:00
Jon Perritt 00ee96fb6f openstack servers and keypairs docs 2015-03-31 09:54:45 -06:00
Jon Perritt 686cd4b02b add OpenStack to list of IaaS providers 2015-03-31 09:54:45 -06:00
Clint Shryock e485767694 provider/aws: Add non-destructive updates to AWS RDS
This introduces non-destructive, in-place upgrades to MultiAZ and Engine Version
attributes of AWS RDS instances.
2015-03-31 09:41:37 -05:00
Mitchell Hashimoto 2f0235b23d website: docker docs 2015-03-28 19:05:17 -07:00
Mitchell Hashimoto 4a7b554cf7 command/remote-config: do a pull with `terraform remote config` 2015-03-26 17:57:45 -07:00
Clint Shryock 877eb902a0 Merge branch 'master' into time-asg-tags-support
* master:
  update CHANGELOG
  providers/digitalocean: add dot in GET response
  providers/digitalocean: force fqdn in dns rr value
  update CHANGELOG
  Add disk size to google_compute_instance disk blocks.
  'project' should be set to the project's ID, not its name.
  Don't error when enabling DNS hostnames in a VPC
  Correct AWS VPC or route table read functions
  Updates to GCE Instances and Instance Templates to allow for false values to be set for the auto_delete setting.
  Update GCE Instance Template tests now that existing disk must exist prior to template creation.
  Update Google API import to point to the new location.
  add network field to the network_interface
2015-03-26 13:47:46 -05:00
Mitchell Hashimoto c294ce323c Merge pull request #1272 from ndarilek/google-instance-docs-fix
website: 'project' requires ID, not name
2015-03-26 10:21:12 -07:00
Mitchell Hashimoto deb5052454 Merge pull request #1284 from ndarilek/add-size-to-instance-disk
Add size option to disk blocks under google_compute_instance
2015-03-26 10:13:11 -07:00
Radek Simko 7950ace399 Documentation for ASG Tags added 2015-03-26 07:35:16 +00:00
Mitchell Hashimoto 27f4f5889b website: clarify docs on -var-file and terraform.tfvars [GH-1280] 2015-03-25 16:31:22 -07:00
Paul Hinze 6b02cfb700 Merge pull request #1277 from hashicorp/f-aws-derive-root-device-name
providers/aws: derive instance root_block_device name
2015-03-25 15:15:05 -05:00
Paul Hinze b90be254d7 Merge pull request #1290 from spenczar/minor-doc-update
Bring usage docs up to date
2015-03-25 11:18:33 -05:00
Mitchell Hashimoto 280635d2b0 command/push: add -atlas-address 2015-03-24 17:45:19 -07:00
Mitchell Hashimoto 51614b6365 command/push: upload-modules 2015-03-24 17:42:40 -07:00
Mitchell Hashimoto 8d47f26bb7 command/push: address PR comments 2015-03-24 17:41:26 -07:00
Mitchell Hashimoto d7aeb01360 website: remove localhost link 2015-03-24 17:40:12 -07:00
Mitchell Hashimoto 395dd04861 command/push: accept -vcs 2015-03-24 17:03:59 -07:00
Mitchell Hashimoto 20a81a9d05 website: update docs 2015-03-24 17:00:24 -07:00
Mitchell Hashimoto f857363aac website: document push 2015-03-24 13:30:23 -07:00
Spencer Nelson cacc7a5d6f Bring usage docs up to date 2015-03-24 12:06:09 -07:00
Nolan Darilek 9d75fa72ab Add disk size to google_compute_instance disk blocks. 2015-03-24 11:45:20 -05:00
Paul Hinze a4e80b6313 providers/aws: derive instance root_block_device name
I was working on building a validation to check the user-provided
"device_name" for "root_block_device" on AWS Instances, when I realized
that if I can check it, I might as well just derive it automatically!

So that's what we do here - when you customize the details of the root
block device, device name is just comes from the selected AMI.
2015-03-23 11:58:45 -05:00
Nolan Darilek 85fc1bca33 'project' should be set to the project's ID, not its name. 2015-03-21 09:16:16 -05:00
Clint bb4dd8ae77 Merge pull request #1137 from deverton/aws-go-vpn
provider/aws: Add Support For AWS VPN Gateways using aws-sdk-go
2015-03-19 16:12:17 -05:00
Paul Hinze 46b63074e0 Merge pull request #1045 from hashicorp/f-block-devices
providers/aws: rework instance block devices
2015-03-19 09:09:45 -05:00
Paul Hinze 2b23c402ee providers/aws: rework instance block devices
Instance block devices are now managed by three distinct sub-resources:

 * `root_block_device` - introduced previously
 * `ebs_block_device` - all additional ebs-backed volumes
 * `ephemeral_block_device` - instance store / ephemeral devices

The AWS API support around BlockDeviceMapping is pretty confusing. It's
a single collection type that supports these three members each of which
has different fields and different behavior.

My biggest hiccup came from the fact that Instance Store volumes do not
show up in any response BlockDeviceMapping for any EC2 `Describe*` API
calls. They're only available from the instance meta-data service as
queried from inside the node.

This removes `block_device` altogether for a clean break from old
configs. New configs will need to sort their `block_device`
declarations into the three new types. The field has been marked
`Removed` to indicate this to users.

With the new block device format being introduced, we need to ensure
Terraform is able to properly read statefiles written in the old format.
So we use the new `helper/schema` facility of "state migrations" to
transform statefiles in the old format to something that the current
version of the schema can use.

Fixes #858
2015-03-19 09:03:41 -05:00
Dan Everton f7289599cc Merge branch 'master' into aws-go-vpn 2015-03-19 11:03:48 +10:00
Michael H. Oshita 1979d9b792 fix indent
align indentation with the rest of the code.
2015-03-19 03:45:32 +09:00
Clint dc4abb48fa Merge pull request #1195 from hashicorp/f-retire-goamz
provider/aws: Retire goamz
2015-03-16 08:42:40 -05:00
Tarrant 951f4201f7 Add documentation for ssh-agent 2015-03-15 16:37:33 -07:00
Joshua Lund 0d13cd1f54 Typo fix. 2015-03-13 17:37:05 -06:00
Clint Shryock cd15c9aaf9 clean up docs 2015-03-13 16:04:27 -05:00
Clint Shryock 2d62e55b0e Add note to Intergent Gateway resource on using depends_on 2015-03-13 15:39:17 -05:00
Clint Shryock 580b696e7f Strike 'goamz' from the repo' 2015-03-12 16:49:38 -05:00
Dan Everton 9f50b048e1 Merge branch 'master' into aws-go-vpn 2015-03-12 08:09:27 +10:00
Clint Shryock 64f7e6a19c Update website docs on AWS RDS encryption field 2015-03-11 13:37:56 -05:00
Dan Everton 0900452113 Remove type parameter from vpn_gateway docs 2015-03-10 10:32:49 +10:00
Dan Everton 3339ab90c6 Merge branch 'master' into aws-go-vpn 2015-03-10 09:01:41 +10:00
Sander van Harmelen d2c6ae0741 Merge pull request #1163 from svanharmelen/f-cloudstack-vpn-resources
provider/cloudstack: adding vpn resources
2015-03-09 17:50:12 +01:00
Sander van Harmelen bb7ef8db67 Adding tests and docs for the new VPN resources
And did some (very) minor refactoring in the existing docs
2015-03-09 14:00:29 +01:00
Colin Hebert 268920126e Update documentation to reflect the new vpc_security_group_ids parameter 2015-03-07 17:09:13 +11:00
Dan Everton 7565e69ba3 Merge branch 'master' into aws-go-vpn 2015-03-07 09:46:23 +10:00
Jack Pearkes 26cc99bf3f website: add digitalocean ssh_key documentation
cc/ @plalloni
2015-03-06 10:00:41 -08:00
Radek Simko 30707dbd05 Locked dependencies updated to latest versions 2015-03-06 13:07:59 +00:00
Radek Simko c87ac6df04 Replace git:// with https:// in middleman source 2015-03-06 13:06:57 +00:00
Radek Simko 6e6369c7a4 vpc_peering docs added to sidebar 2015-03-06 07:55:38 +00:00
Dan Everton b741e0c9a3 Add documentation 2015-03-06 08:41:22 +10:00
Mitchell Hashimoto 4306405af8 website: docs for new remote commands 2015-03-04 16:35:42 -08:00
Mitchell Hashimoto 23609a7af5 Merge pull request #1096 from hashicorp/f-sprintf
config: add "format' function [GH-758]
2015-03-04 16:05:25 -08:00
Paul Hinze 72d4ac73d3 Merge pull request #1103 from suguru/aws-block-device-iops
providers/aws: add iops to block devices
2015-03-04 12:02:10 -06:00
Mitchell Hashimoto 16cafe9d46 website; clarify where the args go for AWS [GH-853] 2015-03-03 17:35:54 -08:00
Mitchell Hashimoto 9efd20cd7c website: document MFA token for AWS [GH-390] 2015-03-03 17:31:45 -08:00
Mitchell Hashimoto 7f298d5951 website: note that terraform get is required [GH-706] 2015-03-03 17:28:41 -08:00
Mitchell Hashimoto 4ecc6188f6 website: note TF plugin name is important [GH-847] 2015-03-03 17:26:11 -08:00
Mitchell Hashimoto b4435e2c0d Merge pull request #1101 from yikaus/patch-1
website/docs: protocol value for all traffic should be -1
2015-03-03 08:45:30 -08:00
Sander van Harmelen 426fb2e457 Updating the docs so the represent the added feature
Adding info about the `managed` option for port forwards…
2015-03-03 13:51:22 +01:00
Suguru Namura 68efa3fc21 providers/aws: add iops to block devices 2015-03-03 15:57:08 +09:00
Kevin Yi 0e3f1a865e protocol value for all traffic should be -1
If it is all traffic instead of all tcp traffic , protocol should be equal -1 , otherwise indicate all tcp not all traffic
2015-03-03 10:33:54 +11:00
Mitchell Hashimoto bf43cabcc2 website: document format 2015-03-02 10:27:58 -08:00
Mitchell Hashimoto 68e4d346be website: doc replace 2015-03-02 09:40:24 -08:00
Mitchell Hashimoto ac6efa5e57 Merge pull request #1065 from hashicorp/f-taint
Add "taint" command
2015-02-26 23:55:20 -08:00
Jack Pearkes c21c766c3e website: route53 subdomain hosted zones example 2015-02-26 14:20:30 -08:00
Mitchell Hashimoto d411e2939f command/taint: -allow-missing 2015-02-26 10:56:45 -08:00
Mitchell Hashimoto d43c88f5f3 website: update docs for tainted 2015-02-26 10:45:39 -08:00
Mitchell Hashimoto fa9b655fd1 website: docs for tainted command 2015-02-26 10:37:08 -08:00
Jack Pearkes 0ee4e2b46c providers/dme: rename dnsmadeeasy package to dme
This package rename just makes one consistent name across the docs,
packages, and dirs.

cc/ @soniah
2015-02-25 15:54:22 -08:00
Jack Pearkes dfaa428728 Merge pull request #855 from soniah/dme
dme - DNSMadeEasy Provider
2015-02-25 14:38:38 -08:00
Clint Shryock d79b0d7fd1 provider/aws: Convert AWS DB Instance over to awslabs/aws-sdk-go
- Remove check on password for AWS RDS Instance
- Update documentation on AWS RDS Instance regarding DB Security Groups
- Change error handling to check error code from AWS API [ci skip]
2015-02-24 16:51:47 -06:00
Mitchell Hashimoto e2c912c53d website: update docs for self 2015-02-23 15:04:18 -08:00
Paul Hinze 4bc649e60c Merge pull request #1023 from sparkprime/sidebar
Add google resources to sidebar
2015-02-23 09:58:25 -06:00
Dave Cunningham 19af96bd87 Add google resources to sidebar 2015-02-22 20:44:00 -05:00
Mitchell Hashimoto 45a267111b Merge pull request #885 from brycekahle/split-func
config: add split function
2015-02-20 13:45:01 -08:00
Mitchell Hashimoto 3093268106 website: clarify lookup [GH-531] 2015-02-20 10:04:53 -08:00
Paul Hinze 73d20b4c58 providers/aws: add root_block_device to aws_instance
AWS provides a single `BlockDeviceMapping` to manage three different
kinds of block devices:

 (a) The root volume
 (b) Ephemeral storage
 (c) Additional EBS volumes

Each of these types has slightly different semantics [1].

(a) The root volume is defined by the AMI; it can only be customized
with `volume_size`, `volume_type`, and `delete_on_termination`.

(b) Ephemeral storage is made available based on instance type [2]. It's
attached automatically if _no_ block device mappings are specified, and
must otherwise be defined with block device mapping entries that contain
only DeviceName set to a device like "/dev/sdX" and VirtualName set to
"ephemeralN".

(c) Additional EBS volumes are controlled by mappings that omit
`virtual_name` and can specify `volume_size`, `volume_type`,
`delete_on_termination`, `snapshot_id`, and `encryption`.

After deciding to ignore root block devices to fix #859, we had users
with configurations that were attempting to manage the root block device chime
in on #913.

Terraform does not have the primitives to be able to properly handle a
single collection of resources that is partially managed and partially
computed, so our strategy here is to break out logical sub-resources for
Terraform and hide the BlockDeviceMapping inside the provider
implementation.

Now (a) is supported by the `root_block_device` sub-resource, and (b)
and (c) are still both merged together under `block_device`, though I
have yet to see ephemeral block devices working properly.

Looking into possibly separating out `ephemeral_block_device` and
`ebs_block_device` sub-resources as well, which seem like the logical
next step. We'll wait until the next big release for this, though, since
it will break backcompat.

[1] http://bit.ly/ec2bdmap
[2] http://bit.ly/instancestorebytype

Fixes #913
Refs #858
2015-02-18 13:15:11 -06:00
Mitchell Hashimoto 44c45994c8 Merge pull request #963 from julienba/master
providers/aws: vpc_peering_connection
2015-02-18 06:56:28 -08:00
jba 372035368f allow update 2015-02-18 10:45:12 +01:00
Mitchell Hashimoto 0feb29944c Merge pull request #856 from CashStar/aws_egress
provider/aws: adding support for egress rules in AWS Security Groups
2015-02-17 13:59:47 -08:00
Bryce Kahle fa8280a56c Add split docs 2015-02-17 13:24:34 -05:00
nevins-b b7238ca6f2 adding documentation 2015-02-17 13:23:10 -05:00
Mitchell Hashimoto c5e035361f Merge pull request #896 from bitglue/storage_type
provider/aws: Support storage_type parameter for aws_db_instance
2015-02-17 09:30:03 -08:00
Mitchell Hashimoto f63aa41d67 Merge pull request #897 from bitglue/apply_method
provider/aws: Implement apply_method for RDS parameters
2015-02-17 09:28:24 -08:00
Mitchell Hashimoto 1fa6141a39 Merge pull request #933 from egarbi/master
docs: Added missing line for aws_launch_configuration resource on AWS provider...
2015-02-17 09:24:50 -08:00
Jeremy Voorhis c4869ef3b1 Add missing preposition. 2015-02-13 21:46:40 -08:00
Jeremy Voorhis 729939f122 Fill in missing outputs in modules.html.md. 2015-02-13 21:27:54 -08:00
Paul Hinze fad6f69071 Revert "Add Azure provider"
This reverts commit f561e2a6a8.
2015-02-13 12:53:01 -06:00
Paul Hinze edaed1fa77 Merge pull request #966 from TimeInc/ig-tags-docs
Add docs for AWS IG tags
2015-02-13 12:34:50 -06:00
jba 101f801846 add aws_vpc_peering_connection 2015-02-12 10:45:29 +01:00
Radek Simko 3366f1924f Add docs for AWS IG tags 2015-02-11 13:33:59 +00:00
Dave Cunningham 66ad26f19a Merge branch 'master' into oauth2 2015-02-11 00:37:13 -05:00
jba 3b0b41c9a1 allow vpc_peering_connection_id in aws_route_table 2015-02-10 17:50:29 +01:00
Phil Frost 81b5c238ef Clarify usage of `aws_elb`
Address confusion regarding ELB in VPC or EC2-classic. See #958.
2015-02-10 11:13:54 -05:00
Paul Hinze 448edd1a83 Merge pull request #959 from BashtonLtd/gce_instance_template
GCE instance template support
2015-02-10 08:57:45 -06:00
David Watson 7df536345c Add docs for google Instance Template. 2015-02-10 10:41:21 +00:00
Dave Cunningham 26b90c10a0 Merge branch 'master' into gcp_image 2015-02-10 03:25:45 -05:00
Dave Cunningham e898daf573 Merge branch 'master' into oauth2 2015-02-09 20:07:36 -05:00
Paul Hinze 6e27da8c47 Merge pull request #937 from sparkprime/pr_network_interface
Deprecated 'network', introduce 'network_interface'
2015-02-09 18:49:56 -06:00
Amadeus Demarzi 61536cb1f8 Attach Chainable timers to Engine render loop
Previous to this commit, the Chainable class which is responsible for
iterating on the sequence of events in the intro Terraform animation,
was using setTimeout and thus could result in very messed up race
conditions when triggering physics changes.

This commit attaches the .wait timers to the Engine.render loop which
should enable everything to stay in sync.
2015-02-06 15:28:26 -08:00
Julien Vey 33eebbed51 provider/gce: Add description in firewall resource 2015-02-06 13:33:02 +01:00
Dave Cunningham b385093502 Deprecated 'network', introduce 'network_interface' 2015-02-06 03:21:22 -05:00
Enrique Garbi 2b3015f66a Added missing line for aws_launch_configuration resource on AWS provider docs 2015-02-05 17:05:14 +00:00
Paul Hinze f852a01c22 providers/aws: docs for aws_main_route_table_association 2015-02-03 15:13:15 -06:00
Paul Hinze 44759903fa Merge pull request #895 from hashicorp/588-gcp-improvements
Multiple gcp improvements and new resources
2015-01-30 16:49:22 -06:00
Dave Cunningham 12db8bc9d3 Merge branch 'master' into oauth2 2015-01-30 17:48:49 -05:00