Patrick Lee
80af6825fb
changed combine() to concat() in docs
...
The example of the concat() function uses combine() instead of concat().
2015-07-09 17:04:36 -06:00
Sander van Harmelen
2d952c450c
Merge pull request #2673 from svanharmelen/f-touchup-tests
...
provisioner/chef: tweaking the tests
2015-07-09 21:33:33 +02:00
Sander van Harmelen
97fd4f5b7d
Tweaking the tests
2015-07-09 21:29:27 +02:00
Sander van Harmelen
0dc0cff14d
Merge pull request #2657 from blueharford/master
...
provisioner/chef: add secret key
2015-07-09 20:20:46 +02:00
Paul Hinze
108076ddcb
Update CHANGELOG.md
2015-07-09 10:57:28 -06:00
Paul Hinze
4c1c67b520
Merge pull request #2626 from jtopjian/openstack-allow-empty-apikey-endpointtype
...
provider/openstack: Allow empty api_key and endpoint_type
2015-07-09 10:55:56 -06:00
Paul Hinze
aacfb4276d
Merge pull request #2667 from paychex/master
...
Fix issues building documentation behind corporate filewall on Windows.
2015-07-09 10:07:15 -06:00
Paul Hinze
001dfe1dc6
Merge pull request #2668 from elblivion/master
...
Minor correction to AWS RDS provider docs
2015-07-09 09:58:25 -06:00
Paul Hinze
933bc85c8f
Merge pull request #2669 from kjperry/master
...
provider/aws: bump internet gateway detach timeout
2015-07-09 09:49:55 -06:00
Katelyn Perry
6fbebe3172
provider/aws: bump internet gateway detach timeout
2015-07-09 10:42:16 -05:00
Anthony Stanton
49a1f21a09
Use correct terms in DB Subnet Group docs
2015-07-09 17:39:05 +02:00
Richard A. Steele
d71e9b968a
Fix issues building documentation behind corporate filewall on Windows.
...
Use https: instead of git: to getch from repository
Manually fetch gpg key to avoid proxy issues
Start up middleman server
Open up port 4567 so it's available from host
2015-07-09 11:07:45 -04:00
Joshua Seidel
147efbc52c
update markdown
2015-07-09 10:13:54 -04:00
Joshua Seidel
cda814d8b3
No need to do this as they both are in their own scope
2015-07-09 09:32:13 -04:00
Joshua Seidel
4070805fcd
ran gofmt removed required, added IF
2015-07-09 09:05:12 -04:00
Joshua Seidel
61f47d440d
correct space, fix reading of file
2015-07-08 20:06:37 -04:00
Joshua Seidel
090248fab1
fix errors
2015-07-08 19:41:38 -04:00
Joshua Seidel
cd58da773c
remove unused if
2015-07-08 15:25:00 -04:00
Clint
ab0a7d8096
Update CHANGELOG.md
2015-07-08 13:11:10 -06:00
Clint
b169a53786
Merge pull request #2642 from hashicorp/f-aws-elasticache-maintenance-window
...
provider/aws: Add maintenance window to ElastiCache cluster
2015-07-08 13:10:32 -06:00
Joshua Seidel
7f4a5ac413
fix if statement and condition
2015-07-08 15:09:17 -04:00
Clint
9141760474
Merge pull request #2655 from GrayCoder/master
...
fix markdown for aws_iam_policy_attachment
2015-07-08 13:08:30 -06:00
Clint Shryock
ef28007988
merge master
2015-07-08 13:05:33 -06:00
Joshua Seidel
6e21ca50a0
add chef secret key
2015-07-08 14:52:23 -04:00
Clint
655e1ddf78
Update CHANGELOG.md
2015-07-08 12:33:03 -06:00
Clint
d34bd0d227
Merge pull request #2640 from hashicorp/b-aws-spot-instance-fix
...
provider/aws: Fix issue where spot instance requests would crash
2015-07-08 12:32:13 -06:00
Clint
ec6f866561
Update CHANGELOG.md
2015-07-08 12:31:06 -06:00
Clint
f2ff63d0da
Merge pull request #2644 from hashicorp/b-aws-sg-account-update
...
provider/aws: Fix issue in Classic env with external Security Groups
2015-07-08 12:29:50 -06:00
Patrick Gray
b32008804e
fix markdown for aws_iam_policy_attachment
2015-07-08 14:25:57 -04:00
Clint
c2cf7442ea
Update CHANGELOG.md
2015-07-08 12:05:32 -06:00
Clint
82d142cc5f
Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap
...
provider/aws: Add support for restoring from Redis backup stored in S3
2015-07-08 11:51:23 -06:00
Clint Shryock
cc79e6cb8d
provider/aws: Fix issue in Classic env with external Security Groups
...
Linking a security group from another account requires setting the UserID, which
we were stripping out
2015-07-07 12:06:36 -06:00
Clint Shryock
49a01ee787
provider/aws: Add maintenance window to ElastiCache cluster
...
Implements #2612
2015-07-07 10:41:46 -06:00
Clint Shryock
2fedaa9a4b
provider/aws: Fix issue where spot instance requests would crash
...
Requests that are pending do not have an InstanceID
2015-07-07 09:48:04 -06:00
Clint
b4c1c223ff
Merge pull request #2635 from hashicorp/b-aws-update-lc-docs
...
provider/aws: Update Launch Configuration docs to reflect required device name
2015-07-06 16:33:04 -06:00
Clint Shryock
91ea40d157
provider/aws: Update Launch Configuration docs to reflect required device name
2015-07-06 16:32:18 -06:00
Clint Shryock
edf8948d52
provider/aws: Add support for restoring from Redis backup stored in S3
...
Fixes #2377
2015-07-06 16:19:15 -06:00
Joe Topjian
5251193f87
Allow empty api_key and endpoint_type
...
These two provider options are optional though if they are not set,
the user will be prompted to enter values.
By changing them to use the envDefaultFuncAllowMissing, the values
are still passed in the environment if they are set and safely
discarded if they are not.
2015-07-06 03:14:13 +00:00
Sander van Harmelen
e800a8d6cc
Merge pull request #2624 from jeroendekorte/f-chef-provisioner-http_proxy
...
provisioner/chef: Fix Chef provisioner http proxy
2015-07-05 09:53:46 +02:00
Radek Simko
1e56b607a0
Merge pull request #2599 from kelcecil/ebs_optimized
...
Add ebs_optimized argument to launch_configuration docs
2015-07-05 09:29:58 +02:00
Radek Simko
94bc96d3de
Update CHANGELOG.md
2015-07-04 07:09:47 +02:00
Radek Simko
de4e03c046
Merge pull request #2620 from TimeIncOSS/b-plan-counts
...
core: Return correct number of planned updates
2015-07-04 07:08:24 +02:00
Radek Simko
8d6e2eb064
Merge pull request #2609 from CpuID/cpuid_ecs_task_definition_docs
...
Updated docs for aws_ecs_task_definition, to avoid confusion.
2015-07-03 19:53:59 +02:00
Nathan Sullivan
bba53d46a6
oops :)
2015-07-04 03:41:44 +10:00
Jeroen de Korte
1c14bfd04d
Added the HTTPS proxy option
2015-07-03 16:27:52 +02:00
Jeroen de Korte
007ab6e503
Fixed the http_proxy
2015-07-03 15:04:58 +02:00
Radek Simko
e376f61d1d
core: Return correct number of planned updates
2015-07-03 13:22:10 +02:00
Nathan Sullivan
21a336fb4a
updates as per @radeksimko's comments
2015-07-03 18:30:55 +10:00
Radek Simko
03dc6c4879
Merge pull request #2610 from CpuID/cpuid_ecs_service_docs_iam
...
Fix aws_ecs_service iam_role docs
2015-07-03 07:45:31 +02:00
Radek Simko
487aba6a9c
Update CHANGELOG.md
2015-07-03 00:01:09 +02:00
