Skip to content

Commit

Permalink
The next version in master is at least 1.1.2, not 1.1.1x
Browse files Browse the repository at this point in the history
The OMC hasn't yet decided what the next release version will be, but
it's at least going to 1.1.2, so we set that value for the moment.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from #7180)
  • Loading branch information
levitte committed Sep 11, 2018
1 parent fc4e1ab commit a4a90a8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.

Changes between 1.1.1 and 1.1.1a [xx XXX xxxx]
Changes between 1.1.1 and 1.1.2 [xx XXX xxxx]

*)

Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.

Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.1a [under development]
Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.2 [under development]

o

Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

OpenSSL 1.1.1a-dev
OpenSSL 1.1.2-dev

Copyright (c) 1998-2018 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
Expand Down
4 changes: 2 additions & 2 deletions include/openssl/opensslv.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
# define OPENSSL_VERSION_NUMBER 0x10101010L
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a-dev xx XXX xxxx"
# define OPENSSL_VERSION_NUMBER 0x10102000L
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.2-dev xx XXX xxxx"

/*-
* The macros below are to be used for shared library (.so, .dll, ...)
Expand Down

0 comments on commit a4a90a8

Please sign in to comment.