[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8a0c91d3bdf34957b022ea170ea3fa6cdde0ab85 (commit)
       via  a910a9e98f08c48c4ea24651a29872e71748f969 (commit)
      from  6ec5fce25e81b44c37b37db1cde37670d6bbc678 (commit)


- Log -----------------------------------------------------------------
commit 8a0c91d3bdf34957b022ea170ea3fa6cdde0ab85
Author: Matt Caswell <matt at openssl.org>
Date:   Tue May 1 13:55:46 2018 +0100

    Prepare for 1.1.1-pre7-dev
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit a910a9e98f08c48c4ea24651a29872e71748f969
Author: Matt Caswell <matt at openssl.org>
Date:   Tue May 1 13:46:05 2018 +0100

    Prepare for 1.1.1-pre6 release
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 README                     | 2 +-
 include/openssl/opensslv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 7484255..1942f7b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1-pre6-dev
+ OpenSSL 1.1.1-pre7-dev
 
  Copyright (c) 1998-2018 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index fc1e2b5..c970c18 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -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  0x10101006L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre6-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101007L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre7-dev  xx XXX xxxx"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)