Revert "Prepare release"

This reverts commit 221e41bd32e433f6e08bbfedb013fc49c9aa1283.

3 files changed, 16 insertions, 39 deletions

diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 7fc4e5bb58..46e6762b90 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,37 +31,6 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
-<section><title>SASL 4.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The experimental HiPE application has been removed,
-	    together with all related functionality in other
-	    applications.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-16963</p>
-        </item>
-        <item>
-          <p>
-	    Recognize new key 'optional_applications' in application
-	    resource files.</p>
-          <p>
-	    Own Id: OTP-17189 Aux Id: PR-2675 </p>
-        </item>
-        <item>
-	    <p>Removed timestamps from files generated by <c>sasl</c>
-	    and <c>reltool</c> to enable deterministic builds.</p>
-          <p>
-	    Own Id: OTP-17292 Aux Id: PR-4685, PR-4684 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SASL 4.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 863ed16dc5..4fff8f79ab 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,28 +19,36 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
+%% - OTP 21
 %% - OTP 22
 %% - OTP 23
-%% - OTP 24
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.4$">>,[restart_new_emulator]},
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.3$">>,[restart_new_emulator]},
+  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^4\\.0$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.3$">>,[restart_new_emulator]},
+  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^4\\.0$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 4b224b7215..a61b72d6f6 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.1
+SASL_VSN = 4.0.2