summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2017-02-05 21:27:52 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2017-02-05 21:27:52 +0530
commit58557c229319a3b8d2eefdb62e7df95089eabe37 (patch)
tree2d7cfa3fa057440f4eefb3fdf511d85b90fc3c98
parentdb0242e3023436757bbc7c488a779e6e3343db04 (diff)
downloadglibc-58557c229319a3b8d2eefdb62e7df95089eabe37.tar.gz
Open master for developmentglibc-2.25.90
-rw-r--r--ChangeLog4
-rw-r--r--NEWS14
-rw-r--r--version.h4
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f140ee67de..6037fef737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2017-02-05 Siddhesh Poyarekar <siddhesh@sourceware.org>
+ * version.h (RELEASE): Set to "development"
+ (VERSION): Set to 2.25.90.
+ * NEWS: Add 2.26 section.
+
* version.h (RELEASE): Set to "stable"
(VERSION): Set to 2.25.
* include/features.h (__GLIBC_MINOR__): Set to 25.
diff --git a/NEWS b/NEWS
index ec15dde761..b5a401c1e3 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,20 @@ See the end for copying conditions.
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
+Version 2.26
+
+[Add important changes here]
+
+Security related changes:
+
+ [Add security related changes here]
+
+The following bugs are resolved with this release:
+
+ [The release manager will add the list generated by
+ scripts/list-fixed-bugs.py just before the release.]
+
+
Version 2.25
* The feature test macro __STDC_WANT_LIB_EXT2__, from ISO/IEC TR
diff --git a/version.h b/version.h
index dc2064f01f..48a40b4a68 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
-#define RELEASE "stable"
-#define VERSION "2.25"
+#define RELEASE "development"
+#define VERSION "2.25.90"