aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
committerHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
commit9a81b28598fadc44bf506354c9227e41aac786f6 (patch)
tree67b1db67c5050ce5cf37a182841ab34c6cbc5fe9 /lib/inets
parent6a3e878126da1e8d75c704510c7a7339ff306138 (diff)
downloadotp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.gz
otp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.bz2
otp-9a81b28598fadc44bf506354c9227e41aac786f6.zip
Revert "Prepare release"
This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/notes.xml21
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 2 insertions, 21 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 7939787601..12bbc2b736 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,26 +32,7 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.0</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Remove Server Side Include support from inets, as this is
- an old technic that has security issues and was not well
- tested.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-12156</p>
- </item>
- </list>
- </section>
-
-</section>
-
-<section><title>Inets 5.10.7</title>
+ <section><title>Inets 5.10.7</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index d5cb460404..e9ecb2632a 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,6 +18,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.0
+INETS_VSN = 5.10.7
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"