Skip to content

Commit 02dd675

Browse files
zkbotzkbot
committed
Auto merge of zcash#2585 - str4d:release-v1.0.11, r=str4d
Release v1.0.11
2 parents 2a42478 + 71629a3 commit 02dd675

File tree

11 files changed

+29
-16
lines changed

11 files changed

+29
-16
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Zcash 1.0.11-rc1
1+
Zcash 1.0.11
22
=============
33

44
What is Zcash?

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 1)
44
define(_CLIENT_VERSION_MINOR, 0)
55
define(_CLIENT_VERSION_REVISION, 11)
6-
define(_CLIENT_VERSION_BUILD, 25)
6+
define(_CLIENT_VERSION_BUILD, 50)
77
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
88
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
99
define(_CLIENT_VERSION_IS_RELEASE, true)

‎contrib/debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
zcash (1.0.11) stable; urgency=medium
2+
3+
* 1.0.11 release.
4+
5+
-- Zcash Company <[email protected]> Tue, 15 Aug 2017 10:06:25 +0100
6+
17
zcash (1.0.11~rc1) stable; urgency=medium
28

39
* 1.0.11-rc1 release.

‎contrib/gitian-descriptors/gitian-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "zcash-1.0.11-rc1"
2+
name: "zcash-1.0.11"
33
enable_cache: true
44
distro: "debian"
55
suites:

‎doc/authors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Zcash Contributors
22
==================
33

4-
Jack Grigg (443)
4+
Jack Grigg (445)
55
Simon Liu (269)
66
Sean Bowe (188)
77
Daira Hopwood (102)

‎doc/man/zcash-cli.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11-rc1" "User Commands"
2+
.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11" "User Commands"
33
.SH NAME
4-
zcash-cli \- manual page for zcash-cli v1.0.11-rc1
4+
zcash-cli \- manual page for zcash-cli v1.0.11
55
.SH DESCRIPTION
6-
Zcash RPC client version v1.0.11\-rc1
6+
Zcash RPC client version v1.0.11
77
.PP
88
In order to ensure you are adequately protecting your privacy when using Zcash,
99
please see <https://z.cash/support/security/index.html>.

‎doc/man/zcash-tx.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11-rc1" "User Commands"
2+
.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11" "User Commands"
33
.SH NAME
4-
zcash-tx \- manual page for zcash-tx v1.0.11-rc1
4+
zcash-tx \- manual page for zcash-tx v1.0.11
55
.SH DESCRIPTION
6-
Zcash zcash\-tx utility version v1.0.11\-rc1
6+
Zcash zcash\-tx utility version v1.0.11
77
.SS "Usage:"
88
.TP
99
zcash\-tx [options] <hex\-tx> [commands]

‎doc/man/zcashd.1

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH ZCASHD "1" "August 2017" "zcashd v1.0.11-rc1" "User Commands"
2+
.TH ZCASHD "1" "August 2017" "zcashd v1.0.11" "User Commands"
33
.SH NAME
4-
zcashd \- manual page for zcashd v1.0.11-rc1
4+
zcashd \- manual page for zcashd v1.0.11
55
.SH DESCRIPTION
6-
Zcash Daemon version v1.0.11\-rc1
6+
Zcash Daemon version v1.0.11
77
.PP
88
In order to ensure you are adequately protecting your privacy when using Zcash,
99
please see <https://z.cash/support/security/index.html>.
@@ -54,7 +54,7 @@ Specify data directory
5454
\fB\-disabledeprecation=\fR<version>
5555
.IP
5656
Disable block\-height node deprecation and automatic shutdown (example:
57-
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11\-rc1)
57+
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11)
5858
.HP
5959
\fB\-exportdir=\fR<dir>
6060
.IP

‎doc/release-notes/release-notes-1.0.11.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Changelog
2+
=========
3+
4+
Jack Grigg (2):
5+
make-release.py: Versioning changes for 1.0.11.
6+
make-release.py: Updated manpages for 1.0.11.
7+

‎src/clientversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define CLIENT_VERSION_MAJOR 1
1919
#define CLIENT_VERSION_MINOR 0
2020
#define CLIENT_VERSION_REVISION 11
21-
#define CLIENT_VERSION_BUILD 25
21+
#define CLIENT_VERSION_BUILD 50
2222

2323
//! Set to true for release, false for prerelease or test build
2424
#define CLIENT_VERSION_IS_RELEASE true

‎src/deprecation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define ZCASH_DEPRECATION_H
77

88
// Deprecation policy is 4th third-Tuesday after a release
9-
static const int APPROX_RELEASE_HEIGHT = 159000;
9+
static const int APPROX_RELEASE_HEIGHT = 167200;
1010
static const int WEEKS_UNTIL_DEPRECATION = 18;
1111
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
1212

0 commit comments

Comments
 (0)