From ed3c6f29effb32bec300d3e9b72472cac5d0fd06 Mon Sep 17 00:00:00 2001
From: Matthew Hooker <mwhooker@gmail.com>
Date: Wed, 2 Nov 2016 15:37:40 -0700
Subject: [PATCH] update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a436ca9ec..94999d28c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@ BUG FIXES:
   * builder/amazon: Fixed an error where we wouldn't fail the build even if we
       timed out waiting for the temporary security group to become available.
       [GH-4099]
+  * builder/google: Fix issue where we'd hang waiting for a startup script
+      which doesn't exist. [GH-4102]
 
 ## 0.11.0 (October 21, 2016)