summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-10-28 12:22:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-10-28 15:30:49 -0300
commit29ab0bf0a9c8b0b564548a275cc789ecf77f40c8 (patch)
tree252fdea27a80d902f18ff9287e4fbc21fcd09308
parent98af9c20e0582a113133613b673552236e920be9 (diff)
Fold in changes
Update release date and version name.
-rw-r--r--CHANGELOG.rst7
-rw-r--r--changes/bug_6146_handle_removals_release1
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3c863657..0a5b6229 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,8 +6,8 @@ History
2014
====
-0.7.0 September 26 -- the "one time download, all time updates" release:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+0.7.0rc3 October 28 -- the "One window to rule them all, and in the darkness bind them." release:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- Select current provider on EIP preferences. Closes #5815.
- Handle logout correctly when we stop_services to launch the
@@ -33,6 +33,9 @@ History
- Remove the Advanced Key Management since we don't support stable
mail yet. Closes #6087.
- Single combined preferences window. Closes #4704, #4119, #5885.
+- Fix soledad imports (#5989).
+- Make pkg/tuf/release.py handle removals in the repo
+
0.6.1 August 15 -- the "knock knock knocking on beta's door" release:
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/changes/bug_6146_handle_removals_release b/changes/bug_6146_handle_removals_release
deleted file mode 100644
index 6fe67d62..00000000
--- a/changes/bug_6146_handle_removals_release
+++ /dev/null
@@ -1 +0,0 @@
-- Make pkg/tuf/release.py handle removals in the repo