Merge remote-tracking branch 'upstream/master' into 363-pdns

kubernetes-sigs · Feb 12, 2018 · 4c9f3de · 4c9f3de
2 parents aff13fe + bd1aef2
commit 4c9f3de
Show file tree

Hide file tree

Showing 2,118 changed files with 109,970 additions and 743,551 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
     - If kubernetes resource is deleted, then another resource may acquire DNS name
     - "Flapping" target issue is resolved by providing a consistent and defined mechanism for choosing a target
   - New `--zone-id-filter` parameter allows filtering by zone id (#422) @vboginskey
+  - TTL annotation check for azure records (#436) @stromming
+  - Switch from glide to dep (#435) @bkochendorfer
 
 ## v0.4.8 - 2017-11-22