Merge lp:~gandelman-a/ubuntu/precise/nova/891227 into lp:ubuntu/precise/nova

[Adam Gandelman]

Seems flag parsing has changed since diablo, --force_dhcp_release no longer takes a parameter

[Chuck Short (zulcss)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 10:56:30 +0000
+++ debian/changelog	2011-12-02 20:37:25 +0000
@@ -1,3 +1,10 @@
+nova (2012.1~e2~20111202.11641-0ubuntu2) precise; urgency=low
+
+  * debian/nova.conf: Remove parameter to --force_dhcp_release 
+    (LP: #891227)
+
+ -- Adam Gandelman <[e-mail]>  Fri, 02 Dec 2011 11:31:34 -0800
+
 nova (2012.1~e2~20111202.11641-0ubuntu1) precise; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/nova.conf'
--- debian/nova.conf	2011-09-27 14:56:59 +0000
+++ debian/nova.conf	2011-12-02 20:37:25 +0000
@@ -3,7 +3,7 @@
 --logdir=/var/log/nova
 --state_path=/var/lib/nova
 --lock_path=/var/lock/nova
---force_dhcp_release=True
+--force_dhcp_release
 --use_deprecated_auth
 --iscsi_helper=tgtadm
 --verbose