Commit Graph

19376 Commits

Author SHA1 Message Date
Paul Stack 2aa7faa38c Update CHANGELOG.md 2017-05-11 14:57:19 +03:00
stack72 6063898e06
Merge branch 'master' of github.com:hashicorp/terraform 2017-05-11 14:56:01 +03:00
stack72 0f4b818345
Merge branch 'DanielMSchmidt-feat/device-farm-integration' 2017-05-11 14:55:53 +03:00
stack72 dc00c6bc09
provider/aws: Add AWS devicefarm docs to AWS navbar 2017-05-11 14:53:49 +03:00
stack72 4942c4d44d
Merge branch 'feat/device-farm-integration' of https://github.com/DanielMSchmidt/terraform into DanielMSchmidt-feat/device-farm-integration 2017-05-11 14:39:30 +03:00
Paul Stack c6efb7ad4c Update CHANGELOG.md 2017-05-11 14:32:34 +03:00
Gerben Jacobs 2178981b44 update docs for `rundeck_job` resource
Change-Id: Id40ae356eaaedf9656b7e38d96d8eb292c9d2cea
2017-05-11 14:30:21 +03:00
Gerben Jacobs 5d1e649581 adds `description` to `command` schema in `rundeck_job` resource
Change-Id: I90e729dd6864b79773c80aedb39991eb251ab821
2017-05-11 14:30:21 +03:00
Chris Johnson 98f6d410a4 Ensure the tests for heroku_cert work (#14371)
See the test for details.
2017-05-11 06:08:06 -05:00
Radek Simko 35caa00c33 Update CHANGELOG.md 2017-05-11 13:06:35 +02:00
Radek Simko 23c004b689 provider/github: Log HTTP requests and responses in DEBUG mode (#14363) 2017-05-11 13:06:05 +02:00
Paul Stack 90db0ff119 Update CHANGELOG.md 2017-05-11 14:05:51 +03:00
Radek Simko 2bd7303bdf Update CHANGELOG.md 2017-05-11 13:05:23 +02:00
Andy Chan dc2835d84f Using the timeout schema helper to make alb timeout cofigurable 2017-05-11 14:05:01 +03:00
Radek Simko 1b2055dfa5 provider/aws: Increase timeout for creating security group (#14380) 2017-05-11 13:04:53 +02:00
Paul Stack f21a96a654 Update CHANGELOG.md 2017-05-11 14:03:04 +03:00
Andy Chan cb1b2acc97 Using timeout schema helper for RDS cluster resource lifecycle mgmt 2017-05-11 14:01:44 +03:00
Andy Chan 4c8b382936 Using the new time schema helper for RDS Instance lifecycle management (https://github.com/hashicorp/terraform/pull/12311) 2017-05-11 14:01:44 +03:00
tombuildsstuff 21af9995e9 Fixing some broken links 2017-05-11 13:55:29 +03:00
Radek Simko 606be1c2e7 Update CHANGELOG.md 2017-05-11 12:52:15 +02:00
Radek Simko e773e59aaf provider/aws: Increase EIP update timeout (#14381) 2017-05-11 12:51:48 +02:00
Radek Simko a846b1b3b0 provider/aws: Fix test config for SES Receipt Rule (#14383) 2017-05-11 12:51:26 +02:00
Sander van Harmelen e238981e9c Update CHANGELOG.md 2017-05-11 12:16:17 +02:00
Sander van Harmelen f8ac496f34 Update CHANGELOG.md 2017-05-11 12:13:20 +02:00
vrenjith c3db6d02d7 Update for storage_os_disk description (#14376)
Changed data to os in the storage_os_disk description
2017-05-11 11:10:09 +01:00
Sander van Harmelen d5782abb59 govendor: update go-cloudstack dependency (#14385)
Fixes #14044
2017-05-11 12:09:08 +02:00
stack72 7cb334b635 release: clean up after v0.9.5 2017-05-11 09:32:32 +00:00
stack72 a59ee0b30e
v0.9.5 2017-05-11 09:22:11 +00:00
Paul Stack 077cfcfeaf Update CHANGELOG.md 2017-05-11 11:43:31 +03:00
Sean Chittenden 67a27b4a45 Make triton machine deletes synchronous. 2017-05-11 11:42:15 +03:00
Paul Stack c21f53ddca Update CHANGELOG.md 2017-05-11 11:40:28 +03:00
tombuildsstuff b3a02b0b78 Ensuring we return an empty slice to match 2017-05-11 11:39:26 +03:00
tombuildsstuff 6fa4ee9997 Formatting 2017-05-11 11:39:26 +03:00
tombuildsstuff 3e23e94c39 Locking on the Subnet's and Virtual Network's given only one NIC in a subnet can be modified at once 2017-05-11 11:39:26 +03:00
tombuildsstuff 58ce4a7223 Refactoring the lockMultiple function out 2017-05-11 11:39:26 +03:00
Jake Champlin 5bca873c41 Merge pull request #14377 from hashicorp/f-add-opc-to-contributing
documentation: Add OPC to CONTRIBUTING
2017-05-10 21:20:25 -04:00
Jake Champlin f811c4c16c
documentation: Add OPC to CONTRIBUTING
Adds the Oracle OPC provider to the list of Hashicorp Providers in the
CONTRIBUTING.md document.
2017-05-10 20:25:43 -04:00
Jake Champlin 59c72724d0 Update CHANGELOG.md 2017-05-10 20:16:09 -04:00
Jake Champlin 570651bb06 Merge pull request #14299 from hashicorp/f-sg-add-issue-3205
provider/aws: Fix SG update on instance with multiple network interfaces
2017-05-10 20:14:06 -04:00
Paddy ccc9a635d5 Update CHANGELOG.md 2017-05-10 15:52:23 -07:00
Paddy 25ed7cc6c0 Merge pull request #14280 from hashicorp/paddy_container_versions
providers/google: add google_container_versions data source.
2017-05-10 15:50:16 -07:00
Paddy de93082375 More doc updates container => container engine. 2017-05-10 15:41:02 -07:00
James Nugent 01c3a2ef42 Merge pull request #14367 from sean-/f-triton-context
Chase API in upstream joyent/triton-go
2017-05-10 17:17:46 -05:00
Paddy 9078efc478 Update test names. 2017-05-10 15:12:14 -07:00
Paddy 1709ea4414 google_container_versions => google_container_engine_versions
As per feedback from @danawillow and @radeksimko.
2017-05-10 15:01:15 -07:00
Sean Chittenden b6eb0abcef
Chase API breakage from github.com/joyent/triton-go: add context.Background() 2017-05-10 14:54:57 -07:00
Sean Chittenden 4f590cb4fd
Update to the latest github.com/joyent/triton-go 2017-05-10 14:54:06 -07:00
Evan Phoenix f1a8b2888b Merge pull request #14334 from hashicorp/f-govcloud-s3-tags
Don't error out getting s3 object tags in govcloud
2017-05-10 14:45:13 -07:00
Paddy cd33995dbc Update CHANGELOG.md 2017-05-10 14:29:18 -07:00
Annie Hedgpeth 4626293a17 provider/azurerm: Add example of traffic manager (#14337)
* initial commit - 101-vm-from-user-image

* changed branch name

* not deploying - storage problems

* provisions vm but image not properly prepared

* storage not correct

* provisions properly

* changed main.tf to azuredeploy.tf

* added tfvars and info for README

* tfvars ignored and corrected file ext

* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing

* deploy.sh to be executable

* executable deploy files

* added CI files; changed vars

* prep for PR

* removal of old folder

* prep for PR

* wrong args for travis

* more PR prep

* updated README

* commented out variables in terraform.tfvars

* Topic 101 vm from user image (#2)

* initial commit - 101-vm-from-user-image
* added tfvars and info for README
* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing
* prep for PR

* added new template

* oops, left off master

* prep for PR

* correct repository for destination

* renamed scripts to be more intuitive; added check for docker

* merge vm simple; vm from image

* initial commit

* deploys locally

* updated deploy

* consolidated deploy and after_deploy into a single script; simplified ci process; added os_profile_linux_config

* added terraform show

* changed to allow http & https (like ARM tmplt)

* changed host_name & host_name variable desc

* added az cli check

* on this branch, only build test_dir; master will aggregate all the examples

* merge master

* added new constructs/naming for deploy scripts, etc.

* suppress az login output

* suppress az login output

* forgot about line breaks

* breaking build as an example

* fixing broken build example

* work in progress

* merge of CI config

* fixed grammar in readme

* prep for PR

* deploys locally

* deploys locally

* small README change

* took out armviz button and minor README changes

* changed host_name

* fixed merge conflicts

* changed host_name variable

* updating Hashicorp's changes to merged simple linux branch

* updating files to merge w/master and prep for Hashicorp pr

* Revert "updating files to merge w/master and prep for Hashicorp pr"

This reverts commit b850cd5d2a858eff073fc5a1097a6813d0f8b362.

* Revert "updating Hashicorp's changes to merged simple linux branch"

This reverts commit dbaf8d14a9cdfcef0281919671357f6171ebd4e6.

* added provider to main.tf

* took out armviz button; resolved conflicts in .travis.yml

* removing vm from user image example from this branch

* removed old branch

* azure-2-vms-loadbalancer-lbrules (#13)

* initial commit

* need to change lb_rule & nic

* deploys locally

* updated README

* updated travis and deploy scripts for Hari's repo

* renamed deploy script

* clean up

* prep for PR

* updated readme

* fixing conflict in .travis.yml

* add CI build tag

* azure-traffic-manager-vm (#17)

adding example of azure traffic manager

* prepped for Hashicorp PR

* merging with hashicorp master
2017-05-10 22:19:52 +01:00