2 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 80bb4d12..6edfb14b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
  - add 'manual_cache_clean' option to select manual cleaning of
    the /var/lib/cloud/instance/ link, for a data source that might
    not be present on every boot
+ - make DataSourceEc2 retries and timeout configurable
 0.6.0:
  - change permissions of /var/log/cloud-init.log to accomodate
    syslog writing to it (LP: #704509)
diff --git a/TODO b/TODO
index 93993056..424587b5 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-- configurable timeouts of ec2 md
-- manual management of cache (so as to allow eject of ovf cdrom)
 - conf.d rather than 'opt_include' (or #include)
 - consider 'failsafe' DataSource
   If all others fail, setting a default that