From 50308812c4a347a712e16951a31d9b440c2c1a2e Mon Sep 17 00:00:00 2001
From: Ian Wahbe <ian@wahbe.com>
Date: Wed, 17 Nov 2021 15:15:20 -0800
Subject: [PATCH] Prepare for v3.18.0 release (#8441)

---
 CHANGELOG.md         | 47 ++++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG_PENDING.md | 12 +++++------
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbce778c4..e744814b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,53 @@
 CHANGELOG
 =========
 
+## 3.18.0 (2021-11-17)
+
+### Improvements
+- [ci] - Adds CI detector for Buildkite
+  [#7933](https://github.com/pulumi/pulumi/pull/7933)
+
+- [cli] - Add `--exclude-protected` flag to `pulumi destroy`.
+  [#8359](https://github.com/pulumi/pulumi/pull/8359)
+
+- [cli] Add the ability to use `pulumi org set [name]` to set a default org
+  to use when creating a stacks in the Pulumi Service backend or self-hosted Service.
+  [#8352](https://github.com/pulumi/pulumi/pull/8352)
+
+- [schema] Add IsOverlay option to disable codegen for particular types.
+  [#8338](https://github.com/pulumi/pulumi/pull/8338)
+  [#8425](https://github.com/pulumi/pulumi/pull/8425)
+
+- [sdk/dotnet] - Marshal output values.
+  [#8316](https://github.com/pulumi/pulumi/pull/8316)
+
+- [sdk/python] - Unmarshal output values in component provider.
+  [#8212](https://github.com/pulumi/pulumi/pull/8212)
+
+- [sdk/nodejs] - Unmarshal output values in component provider.
+  [#8205](https://github.com/pulumi/pulumi/pull/8205)
+
+- [sdk/nodejs] - Allow returning failures from Call in the provider without setting result outputs.
+  [#8424](https://github.com/pulumi/pulumi/pull/8424)
+
+- [sdk/go] - Allow specifying Call failures from the provider.
+  [#8424](https://github.com/pulumi/pulumi/pull/8424)
+
+- [codegen/nodejs] - Program generator now uses `fnOutput` forms where
+  appropriate, simplifying auto-generated examples.
+  [#8434](https://github.com/pulumi/pulumi/pull/8434)
+
+### Bug Fixes
+
+- [engine] - Compute dependents correctly during targeted deletes.
+  [#8360](https://github.com/pulumi/pulumi/pull/8360)
+
+- [cli/engine] - Update command respects `--target-dependents`.
+  [#8395](https://github.com/pulumi/pulumi/pull/8395)
+
+- [docs] - Fix broken lists in dotnet docs.
+  [docs#6558](https://github.com/pulumi/docs/issues/6558)
+
 ## 3.17.1 (2021-11-09)
 
 ### Improvements
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 55e6e63e0..4fc9108b7 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -1,15 +1,15 @@
 ### Improvements
-- Adds CI detector for Buildkite
+- [ci] - Adds CI detector for Buildkite
   [#7933](https://github.com/pulumi/pulumi/pull/7933)
 
 - [cli] - Add `--exclude-protected` flag to `pulumi destroy`.
   [#8359](https://github.com/pulumi/pulumi/pull/8359)
 
-- [cli] Adding the ability to use `pulumi org set [name]` to set a default org
-  to use when creating a stacks in the Pulumi Service backend or self-hosted Service
+- [cli] Add the ability to use `pulumi org set [name]` to set a default org
+  to use when creating a stacks in the Pulumi Service backend or self-hosted Service.
   [#8352](https://github.com/pulumi/pulumi/pull/8352)
 
-- [schema] Add IsOverlay option to disable codegen for particular types
+- [schema] Add IsOverlay option to disable codegen for particular types.
   [#8338](https://github.com/pulumi/pulumi/pull/8338)
   [#8425](https://github.com/pulumi/pulumi/pull/8425)
 
@@ -37,8 +37,8 @@
 - [engine] - Compute dependents correctly during targeted deletes.
   [#8360](https://github.com/pulumi/pulumi/pull/8360)
 
-- [cli/engine] - Update command respects `--target-dependents`
+- [cli/engine] - Update command respects `--target-dependents`.
   [#8395](https://github.com/pulumi/pulumi/pull/8395)
 
-- [docs] - Fix broken lists in dotnet docs
+- [docs] - Fix broken lists in dotnet docs.
   [docs#6558](https://github.com/pulumi/docs/issues/6558)