From 589f740909b40d814a4b802263e61ff2b5c35b24 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 21 Aug 2014 16:26:43 -0400
Subject: fix rendering resolv.conf if no 'options' are provided

this makes some changes to the cc_resolv_conf to make its
generate_resolv_conf method more easily callable (for future test).

Also sets it up so that 'options' is always defined when the template
is rendered.

LP: #1328953
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4d8d6427..4d326b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
    are generated. [Jordan Evans] (LP: #1333920)
  - default settings: fix typo resulting in OpenStack and GCE not working
    unless config explicitly provided (LP: #1329583) [Garrett Holmstrom])
+ - fix rendering resolv.conf if no 'options' are provided (LP: #1328953)
 0.7.5:
  - open 0.7.5
  - Add a debug log message around import failures
-- 
cgit v1.2.3