summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-04 16:18:46 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-04 16:18:46 -0300
commit5b09a916bc83d92d5c0ecc62ee3f9788e1a56077 (patch)
tree4a72d5764657a3e5df9bab7e545876e476a6360e
parente449ff91062e4d124e09b164d8eb092b84df9832 (diff)
Fold in changes
-rw-r--r--CHANGELOG7
-rw-r--r--changes/VERSION_COMPAT10
-rw-r--r--changes/feature_4784_memoize-decorator1
-rw-r--r--changes/feature_5191_add-invalid-auth-token-event1
-rw-r--r--changes/support-str-in-charset-detection1
5 files changed, 17 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 52c7ba7..421ce57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.3.7 Apr 4:
+ o Add memoized_method decorator. Closes #4784.
+ o Add Soledad invalid auth token event. Closes #5191.
+ o Support str type in email charset detection.
+
+-- 2014 --
+
0.3.6 Dec 6:
o Update some documentation and packaging bits.
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
new file mode 100644
index 0000000..cc00ecf
--- /dev/null
+++ b/changes/VERSION_COMPAT
@@ -0,0 +1,10 @@
+#################################################
+# This file keeps track of the recent changes
+# introduced in internal leap dependencies.
+# Add your changes here so we can properly update
+# requirements.pip during the release process.
+# (leave header when resetting)
+#################################################
+#
+# BEGIN DEPENDENCY LIST -------------------------
+# leap.foo.bar>=x.y.z
diff --git a/changes/feature_4784_memoize-decorator b/changes/feature_4784_memoize-decorator
deleted file mode 100644
index 5e6bf82..0000000
--- a/changes/feature_4784_memoize-decorator
+++ /dev/null
@@ -1 +0,0 @@
- o Add memoized_method decorator. Closes: #4784
diff --git a/changes/feature_5191_add-invalid-auth-token-event b/changes/feature_5191_add-invalid-auth-token-event
deleted file mode 100644
index b4b6e3c..0000000
--- a/changes/feature_5191_add-invalid-auth-token-event
+++ /dev/null
@@ -1 +0,0 @@
- o Add Soledad invalid auth token event (#5191).
diff --git a/changes/support-str-in-charset-detection b/changes/support-str-in-charset-detection
deleted file mode 100644
index 015aab0..0000000
--- a/changes/support-str-in-charset-detection
+++ /dev/null
@@ -1 +0,0 @@
- o Support str type in email charset detection.