catch up with main fork #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging from upstream
Merging from master
…t resource when azure-sdk-for-go client returns nil in AdditionalUnattendContent.Content
…`additional_unattend_config` in `os_profile_windows_config` as already fixed for `azurerm_virtual_machine` in 443dd11
…ource `azurerm_virtual_machine_scale_set` when using `os_profile_linux_config`
Merge from upstream
Merge branch 'master' of git://github.com/terraform-providers/terraform-provider-azurerm into terraform-providers-master Conflicts: azurerm/provider.go
Merge into master
Documentation: Clarifying Dynamic IP Address Behaviour
[Website] fixing a broken link
…-panic Fix panic in `azurerm_virtual_machine_scale_set` resource with `additional_unattend_config` block
* Adding azure app service resource * adding importer * adding some tests * updating tests to use testlocation() * setting tags * Resolve App Service Import Acceptance test failure * removed additional spaces which were inserted by editor * removing duplicates * adding documentation * running fmt * updating app service resource * updating app service code * updating tests * updating documentation * setting site config * adding more tests * making use of utils module * WIP * Reserved requires an App Service Environment * Fixing the Java apps * Adding tests for remote debugging * remote debugging version needs to be computed * Fixing the tests * Fixing the jetty tests * Removing linux support for the moment * Adding import tests * Handling setting the appSettings/connectionStrings correctly * Updating the documentation * Removing the updates from the create * Updating the documentation * Updating the TODO's
P doc updates
Documentation Updates
* Add automation resources: account, credential, runbook, schedule * Add issue links * Formatting * Fix formatting and logging * Add documentation * Fix auto-merge * Use new utils library * Fix method name * Minor fixes based on the review * Fix formatting * Refactor sku as List Remove name AccountCreateOrUpdateProperties * Get UserName from CredentialProperties instead of top level property * Extend content_link schema with hash and version * Use properties from RunbookProperties * Use TypeList instead of TypeSet * Add timezone to schedule * Remove unsupported interval * Remove interval from schema * Remove interval from docs * Remove first_run field and switch start_time as required field * Fix example in documentation * Fix typo in documentation * Remove nil association * Add validate function for start_time field * Fix timezone in example * Formatting * Add resrouce provider registration * Remove publish content link from read * Fix test, add expirytime, fix logging * Remove Computed tag * Check from state * Refactor credential tests * Fix runbook import test * Refactor logic * Refactor schedule tests * Add diff function for start_time * Remove ExpectNonEmptyPlan * Add DiffSuppressFunc, formatting * Fixing the broken build (caused by a bad rebase) Also swapping the re-initialisation of `sender` to use the shared variable * Vendoring the Azure Automation SDK * Vendoring (plus comma) * Upgrading to SDK 10.3
Adding the automation resources to the sidebar
Additions to `azurerm_key_vault`
sebastus
pushed a commit
that referenced
this pull request
Oct 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.