Merge branch 'master' of github.com:hashicorp/terraform

* 'master' of github.com:hashicorp/terraform:
  Update CHANGELOG.md
  Changing the ElastiCache Cluster configuration_engine to be on the cluster, not on the cache nodes
  Adding configuration endpoint to the elasticache cluster nodes

CHANGELOG.md

@@ -21,6 +21,7 @@ IMPROVEMENTS:
   * provider/aws: add `ses_smtp_password` to `aws_iam_access_key` [GH-3165]
   * provider/aws: read `iam_instance_profile` for `aws_instance` and save to state [GH-3167]
   * provider/aws: Add `versioning` option to `aws_s3_bucket` [GH-2942]
+  * provider/aws: Add `configuation_endpoint` to `aws_elasticache_cluster` [GH-3250]
   * provider/cloudstack: Add `project` parameter to `cloudstack_vpc`, `cloudstack_network`, `cloudstack_ipaddress` and `cloudstack_disk` [GH-3035]
 
 BUG FIXES:

builtin/providers/aws/resource_aws_elasticache_cluster.go

@@ -29,6 +29,10 @@ func resourceAwsElasticacheCluster() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"configuration_endpoint": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"engine": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
@@ -232,7 +236,9 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{})
 		d.Set("engine_version", c.EngineVersion)
 		if c.ConfigurationEndpoint != nil {
 			d.Set("port", c.ConfigurationEndpoint.Port)
+			d.Set("configuration_endpoint", aws.String(fmt.Sprintf("%s:%d", *c.ConfigurationEndpoint.Address, *c.ConfigurationEndpoint.Port)))
 		}
+
 		d.Set("subnet_group_name", c.CacheSubnetGroupName)
 		d.Set("security_group_names", c.CacheSecurityGroups)
 		d.Set("security_group_ids", c.SecurityGroups)

website/source/docs/providers/aws/r/elasticache_cluster.html.markdown

@@ -83,4 +83,6 @@ The following attributes are exported:
 * `cache_nodes` - List of node objects including `id`, `address` and `port`.
    Referenceable e.g. as `${aws_elasticache_cluster.bar.cache_nodes.0.address}`
    
+* `configuration_endpoint` - (Memcached only) The configuration endpoint to allow host discovery
+
 [1]: http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyCacheCluster.html