Updates for krb5-1.18-prerelease

diff --git a/README b/README
index 6b68f4109b918743628c267ed9a0bb86562d4de8..78bdd15839cd78da082a6d65868b7006d2279394 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                   Kerberos Version 5, Release 1.17
+                   Kerberos Version 5, Release 1.18
 
                             Release Notes
                         The MIT Kerberos Team
@@ -73,10 +73,10 @@ from using single-DES cryptosystems.  Among these is a configuration
 variable that enables "weak" enctypes, which defaults to "false"
 beginning with krb5-1.8.
 
-Major changes in 1.17
+Major changes in 1.18
 ---------------------
 
-krb5-1.17 changes by ticket ID
+krb5-1.18 changes by ticket ID
 ------------------------------
 
 Acknowledgements
@@ -178,6 +178,7 @@ reports, suggestions, and valuable resources:
     Russell Allbery
     Brian Almeida
     Michael B Allen
+    Pooja Anil
     Heinz-Ado Arnolds
     Derek Atkins
     Mark Bannister
@@ -197,6 +198,7 @@ reports, suggestions, and valuable resources:
     Michael Calmer
     Andrea Campi
     Julien Chaffraix
+    Puran Chand
     Ravi Channavajhala
     Srinivas Cheruku
     Leonardo Chiquitto
@@ -233,15 +235,18 @@ reports, suggestions, and valuable resources:
     JC Ferguson
     Remi Ferrand
     Paul Fertser
+    Fabiano Fidêncio
     William Fiveash
     Jacques Florent
     Ákos Frohner
     Sebastian Galiano
     Marcus Granado
+    Dylan Gray
     Scott Grizzard
     Helmut Grohne
     Steve Grubb
     Philip Guenther
+    Timo Gurr
     Dominic Hargreaves
     Robbie Harwood
     John Hascall
@@ -258,6 +263,7 @@ reports, suggestions, and valuable resources:
     Jakub Hrozek
     Shumon Huque
     Jeffrey Hutzelman
+    Sergey Ilinykh
     Wyllys Ingersoll
     Holger Isenberg
     Spencer Jackson
@@ -267,11 +273,13 @@ reports, suggestions, and valuable resources:
     Joel Johnson
     Alexander Karaivanov
     Anders Kaseorg
+    Bar Katz
     Zentaro Kavanagh
     Mubashir Kazia
     W. Trevor King
     Patrik Kis
     Martin Kittel
+    Matthew Krupcale
     Mikkel Kruse
     Reinhard Kugler
     Tomas Kuthan
@@ -281,12 +289,15 @@ reports, suggestions, and valuable resources:
     Jan iankko Lieskovsky
     Todd Lipcon
     Oliver Loch
+    Chris Long
     Kevin Longfellow
     Frank Lonigro
     Jon Looney
     Nuno Lopes
+    Todd Lubin
     Ryan Lynch
     Roland Mainz
+    Sorin Manolache
     Andrei Maslennikov
     Michael Mattioli
     Nathaniel McCallum
@@ -309,15 +320,18 @@ reports, suggestions, and valuable resources:
     Javier Palacios
     Tom Parker
     Ezra Peisach
+    Alejandro Perez
     Zoran Pericic
     W. Michael Petullo
     Mark Phalan
+    Sharwan Ram
     Brett Randall
     Jonathan Reams
     Jonathan Reed
     Robert Relyea
     Tony Reix
     Martin Rex
+    Pat Riehecky
     Jason Rogers
     Matt Rogers
     Nate Rosenblum
@@ -326,6 +340,7 @@ reports, suggestions, and valuable resources:
     Guillaume Rousse
     Joshua Schaeffer
     Andreas Schneider
+    Paul Seyfert
     Tom Shaw
     Jim Shi
     Peter Shoults
@@ -345,6 +360,7 @@ reports, suggestions, and valuable resources:
     John Washington
     Stef Walter
     Xi Wang
+    Nehal J Wani
     Kevin Wasserman
     Margaret Wasserman
     Marcus Watts
@@ -359,6 +375,7 @@ reports, suggestions, and valuable resources:
     Neng Xue
     Zhaomo Yang
     Nickolai Zeldovich
+    Bean Zhang
     Hanz van Zijst
     Gertjan Zwartjes
 

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 3dca457f6dff2029cce87b1d03d66f94612ecdf6..471961e64247ec94e96036db9038915a992ce53b 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -50,7 +50,7 @@
  * organization.
  */
 #define KRB5_MAJOR_RELEASE 1
-#define KRB5_MINOR_RELEASE 17
+#define KRB5_MINOR_RELEASE 18
 #define KRB5_PATCHLEVEL 0
 #define KRB5_RELTAIL "prerelease"
 /* #undef KRB5_RELDATE */