Merge branch '0-8-stable' of github.com:hashicorp/terraform into 0-8-…

…stable * '0-8-stable' of github.com:hashicorp/terraform: Update CHANGELOG.md provider/aws: Prevent aws_dms_replication_task panic (#12539)
hashicorp · Mar 8, 2017 · 15c747f · 15c747f
2 parents 586326b + 5343e4b
commit 15c747f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,6 @@ IMPROVEMENTS:
  * provider/docker: added support for linux capabilities [GH-12045]
  * provider/ignition: Migrate all of the igition resources to data sources [GH-11851]
 
-
 BUG FIXES:
 
  * provider/aws: Fixes issue for aws_lb_ssl_negotiation_policy of already deleted ELB [GH-12360]
@@ -25,6 +24,7 @@ BUG FIXES:
  * provider/aws: Check spot instance is running before trying to attach volumes [GH-12459]
  * provider/aws: Add the IPV6 cidr block to the vpc datasource [GH-12529]
  * provider/aws: Error on trying to recreate an existing customer gateway [GH-12501]
+ * provider/aws: Prevent aws_dms_replication_task panic [GH-12539]
  * provider/azurerm: bug fix to prevent crashes during azurerm_container_service provisioning [GH-12516]
  * provider/datadog: Update to datadog_monitor to use default values [GH-12497]
  * provider/google: Minor correction : "Deleting disk" message in Delete method [GH-12521]

diff --git a/builtin/providers/aws/resource_aws_dms_replication_task.go b/builtin/providers/aws/resource_aws_dms_replication_task.go
@@ -27,7 +27,7 @@ func resourceAwsDmsReplicationTask() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"cdc_start_time": {
-				Type:     schema.TypeInt,
+				Type:     schema.TypeString,
 				Optional: true,
 				// Requires a Unix timestamp in seconds. Example 1484346880
 			},