From d03177371cb2a686beebdc9e0b45d45f126b2c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 26 Jul 2013 10:52:50 -0300
Subject: [PATCH] Fold in changes

---
 CHANGELOG                                     | 29 +++++++++++++++++++
 changes/bug-3227_add-TOFU                     |  1 -
 .../bug_2937-events-should-be-asynchronous    |  1 -
 changes/bug_always_logout                     |  2 --
 changes/bug_escape_domain                     |  2 --
 changes/bug_fix_raise_window_win              |  2 --
 changes/bug_fix_rate_displays                 |  3 --
 changes/bug_force_cleanlooks                  |  3 --
 changes/bug_long_login_status                 |  1 -
 changes/bug_segfault_signal                   |  2 --
 changes/feature-3224_code-in-release-builds   |  1 -
 changes/feature_2913_traffic_rates            |  1 -
 changes/feature_2916_check-already_running    |  1 -
 changes/feature_generate_polkit               |  1 -
 changes/workarounds_openvpn                   |  2 --
 15 files changed, 29 insertions(+), 23 deletions(-)
 delete mode 100644 changes/bug-3227_add-TOFU
 delete mode 100644 changes/bug_2937-events-should-be-asynchronous
 delete mode 100644 changes/bug_always_logout
 delete mode 100644 changes/bug_escape_domain
 delete mode 100644 changes/bug_fix_raise_window_win
 delete mode 100644 changes/bug_fix_rate_displays
 delete mode 100644 changes/bug_force_cleanlooks
 delete mode 100644 changes/bug_long_login_status
 delete mode 100644 changes/bug_segfault_signal
 delete mode 100644 changes/feature-3224_code-in-release-builds
 delete mode 100644 changes/feature_2913_traffic_rates
 delete mode 100644 changes/feature_2916_check-already_running
 delete mode 100644 changes/feature_generate_polkit
 delete mode 100644 changes/workarounds_openvpn

diff --git a/CHANGELOG b/CHANGELOG
index 9a078ff78..60881ef28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,32 @@
+0.2.4 Jul 26:
+  o Use the provider CA cert for every request once we have it
+    bootstrapped (TOFU). Closes #3227.
+  o Make calls to leap.common.events asynchronous. Closes #2937.
+  o Always logout when closing the app if the user previously signed
+    in. Fixes #3245.
+  o Make sure the domain field in provider.json is escaped to avoid
+    potential problems. Fixes #3244.
+  o Fix incorrect handling of locks in Windows so that stalled locks
+    do not avoid raising the first instance of the app. Closes: #2910
+  o Use traffic rates instead of totals. Closes #2913
+  o Allow to alternate between rates and total throughput for the
+    virtual interface. Closes: #3232
+  o Reset rates/totals when terminating connection. Closes #3249
+  o Fix a bug in the displayed magnitude for the up/down traffic rates
+    and totals.
+  o Force Cleanlooks style if we are running in a KDE environment, so
+    that it doesn't load potentially incompatible Qt libs. Fixes
+    #3194.
+  o Wrap long login status messages to 40 characters. Fixes #3124
+  o Workaround a segmentation fault when emitting a signal with its
+    last parameter being None. Fixes #3083.
+  o Added IS_RELEASE_VERSION flag that allows us to use code only in
+    develop versions. Closes #3224.
+  o Try to terminate already running openvpn instances. Closes #2916
+  o Linux: Dynamically generate policy file for polkit. Closes #3208
+  o Workaround some OpenVPN problems with priviledge dropping and
+    routing. Fixes #3178 #3135 #3207 #3203
+
 0.2.3 Jul 12:
   o Adapt code to Soledad 0.2.1 api.
   o Fix Main Window briefly display before the wizard on first
diff --git a/changes/bug-3227_add-TOFU b/changes/bug-3227_add-TOFU
deleted file mode 100644
index d918c8d49..000000000
--- a/changes/bug-3227_add-TOFU
+++ /dev/null
@@ -1 +0,0 @@
-  o Use the provider CA cert for every request once we have it bootstrapped (TOFU). Closes #3227.
diff --git a/changes/bug_2937-events-should-be-asynchronous b/changes/bug_2937-events-should-be-asynchronous
deleted file mode 100644
index e579e79c4..000000000
--- a/changes/bug_2937-events-should-be-asynchronous
+++ /dev/null
@@ -1 +0,0 @@
-  o Made calls to leap.common.events asynchronous. Closes #2937.
diff --git a/changes/bug_always_logout b/changes/bug_always_logout
deleted file mode 100644
index eb2c2817d..000000000
--- a/changes/bug_always_logout
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Always logout when closing the app if the user previously signed
-    in. Fixes #3245.
\ No newline at end of file
diff --git a/changes/bug_escape_domain b/changes/bug_escape_domain
deleted file mode 100644
index 6b1f2f9fa..000000000
--- a/changes/bug_escape_domain
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Make sure the domain field in provider.json is escaped to avoid
-    potential problems. Fixes #3244.
\ No newline at end of file
diff --git a/changes/bug_fix_raise_window_win b/changes/bug_fix_raise_window_win
deleted file mode 100644
index ffad7c06c..000000000
--- a/changes/bug_fix_raise_window_win
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Fix incorrect handling of locks in windows so that stalled locks do not
-    avoid raising the first instance of the app. Closes: #2910
diff --git a/changes/bug_fix_rate_displays b/changes/bug_fix_rate_displays
deleted file mode 100644
index b4b42fcbb..000000000
--- a/changes/bug_fix_rate_displays
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Allow to alternate between rates and total throughput for the virtual interface. Closes: #3232
-  o Reset rates/totals when terminating connection. Closes #3249
-  o Fix a bug in the displayed magnitude for the up/down traffic rates and totals.
diff --git a/changes/bug_force_cleanlooks b/changes/bug_force_cleanlooks
deleted file mode 100644
index cc0343c0b..000000000
--- a/changes/bug_force_cleanlooks
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Force Cleanlooks style if we are running in a KDE environment, so
-    that it doesn't load potentially incompatible Qt libs. Fixes
-    #3194.
\ No newline at end of file
diff --git a/changes/bug_long_login_status b/changes/bug_long_login_status
deleted file mode 100644
index 823ed5249..000000000
--- a/changes/bug_long_login_status
+++ /dev/null
@@ -1 +0,0 @@
-  o Wrap long login status messages to 40 characters. Fixes #3124
\ No newline at end of file
diff --git a/changes/bug_segfault_signal b/changes/bug_segfault_signal
deleted file mode 100644
index 39d9c9100..000000000
--- a/changes/bug_segfault_signal
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Workaround a segmentation fault when emitting a signal with its
-    last parameter being None. Fixes #3083.
\ No newline at end of file
diff --git a/changes/feature-3224_code-in-release-builds b/changes/feature-3224_code-in-release-builds
deleted file mode 100644
index 5466d5ae6..000000000
--- a/changes/feature-3224_code-in-release-builds
+++ /dev/null
@@ -1 +0,0 @@
-  o Added IS_RELEASE_VERSION flag that allows us to use code only in develop versions. Closes #3224.
diff --git a/changes/feature_2913_traffic_rates b/changes/feature_2913_traffic_rates
deleted file mode 100644
index 75ebf2477..000000000
--- a/changes/feature_2913_traffic_rates
+++ /dev/null
@@ -1 +0,0 @@
-  o Use traffic rates instead of totals. Closes #2913
diff --git a/changes/feature_2916_check-already_running b/changes/feature_2916_check-already_running
deleted file mode 100644
index 9cd04443b..000000000
--- a/changes/feature_2916_check-already_running
+++ /dev/null
@@ -1 +0,0 @@
-  o Try to terminate already running openvpn instances. Closes #2916
diff --git a/changes/feature_generate_polkit b/changes/feature_generate_polkit
deleted file mode 100644
index c2fcc648e..000000000
--- a/changes/feature_generate_polkit
+++ /dev/null
@@ -1 +0,0 @@
-  o Linux: Dynamically generate policy file for polkit. Closes #3208
\ No newline at end of file
diff --git a/changes/workarounds_openvpn b/changes/workarounds_openvpn
deleted file mode 100644
index 8eafdfb7a..000000000
--- a/changes/workarounds_openvpn
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Workaround some OpenVPN problems with priviledge dropping and
-    routing. Fixes #3178 #3135 #3207 #3203
\ No newline at end of file
-- 
GitLab