release e2factory-2.3.6

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/Changelog b/Changelog
index f8b9178284283c19e5a2260b7c6db54e11cf1235..c6876129a630c6685f95ee67fe1391967705c3c3 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,7 @@
-NEXT:
+e2factory-2.3.6
  * the release build process changed: Results are now stored on the
    results server, results listed in the deploy_results list are
    deployed to the releases server for archive purposes.
-
-e2factory-2.3.6pre1
  * minor bugfixes
  * rsync is now used instead of curl to access local files
  * allow environment configuration in source and results configuration

diff --git a/make.vars b/make.vars
index 340073946d4e1363c3df0ec8a2bd16d54cc1d680..85a1f6a6c9cbc3658f2ee624b56091e780c3a812 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -5,7 +5,7 @@ NAME = e2factory
 MAJOR = 2
 MINOR = 3
 PATCHLEVEL = 6
-EXTRAVERSION = pre1
+EXTRAVERSION =
 ifdef EXTRAVERSION
   VERSION = $(MAJOR).$(MINOR).$(PATCHLEVEL)$(EXTRAVERSION)
 else