From e8536d7ee30c0ce0c80a83ead8d475a724fd0d32 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 13 Aug 2014 13:47:58 -0400
Subject: remove un-used 'end' in result.json and status.json

---
 ChangeLog      | 1 +
 bin/cloud-init | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 296a15cd..8242ff12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
  - SeLinuxGuard: remove invalid check that looked for stat.st_mode in os.lstat.
  - do not write comments in /etc/timezone (LP: #1341710)
  - ubuntu: provide 'ubuntu-init-switch' module to aid in systemd testing.
+ - status/result json: remove 'end' entry which was always null
 0.7.5:
  - open 0.7.5
  - Add a debug log message around import failures
diff --git a/bin/cloud-init b/bin/cloud-init
index ad0ba214..866f8ca4 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -478,7 +478,7 @@ def status_wrapper(name, args, data_d=None, link_d=None):
         nullstatus = {
             'errors': [],
             'start': None,
-            'end': None,
+            'finished': None,
         }
         status = {'v1': {}}
         for m in modes:
-- 
cgit v1.2.3