DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Auto merge of #2474 - bitcartel:release-v1.0.10-1, r=bitcartel

Browse Source 
Release v1.0.10-1
This commit is contained in:
Homu
2017-06-23 20:13:47 -07:00
parent ad5e8a544b 2762b68576
commit d6ec3954c6
11 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -1,4 +1,4 @@
Zcash 1.0.10
Zcash 1.0.10-1
=============
What is Zcash?
configure.ac
+1 -1
View File
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 10)
define(_CLIENT_VERSION_BUILD, 50)
define(_CLIENT_VERSION_BUILD, 51)
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)))
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)))
define(_CLIENT_VERSION_IS_RELEASE, true)
contrib/debian/changelog
+6
View File
@@ -1,3 +1,9 @@
zcash (1.0.10+1) stable; urgency=medium
* 1.0.10-1 release.
-- Zcash Company <team@z.cash> Fri, 23 Jun 2017 19:50:41 -0700
zcash (1.0.10) stable; urgency=medium
* 1.0.10 release.
contrib/gitian-descriptors/gitian-linux.yml
+1 -1
View File
@@ -1,5 +1,5 @@
---
name: "zcash-1.0.10"
name: "zcash-1.0.10-1"
enable_cache: true
distro: "debian"
suites:
doc/authors.md
+3 -3
View File
@@ -1,9 +1,9 @@
Zcash Contributors
==================
Jack Grigg (427)
Simon Liu (264)
Sean Bowe (186)
Jack Grigg (428)
Simon Liu (266)
Sean Bowe (188)
Daira Hopwood (95)
Taylor Hornby (65)
Wladimir J. van der Laan (60)
doc/man/zcash-cli.1
+3 -3
View File
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "June 2017" "zcash-cli v1.0.10" "User Commands"
.TH ZCASH-CLI "1" "June 2017" "zcash-cli v1.0.10-1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v1.0.10
zcash-cli \- manual page for zcash-cli v1.0.10-1
.SH DESCRIPTION
Zcash RPC client version v1.0.10
Zcash RPC client version v1.0.10\-1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
doc/man/zcash-tx.1
+3 -3
View File
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-TX "1" "June 2017" "zcash-tx v1.0.10" "User Commands"
.TH ZCASH-TX "1" "June 2017" "zcash-tx v1.0.10-1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v1.0.10
zcash-tx \- manual page for zcash-tx v1.0.10-1
.SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.10
Zcash zcash\-tx utility version v1.0.10\-1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
doc/man/zcashd.1
+5 -5
View File
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "June 2017" "zcashd v1.0.10" "User Commands"
.TH ZCASHD "1" "June 2017" "zcashd v1.0.10-1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v1.0.10
zcashd \- manual page for zcashd v1.0.10-1
.SH DESCRIPTION
Zcash Daemon version v1.0.10
Zcash Daemon version v1.0.10\-1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
@@ -54,7 +54,7 @@ Specify data directory
\fB\-disabledeprecation=\fR<version>
.IP
Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.10)
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.10\-1)
.HP
\fB\-exportdir=\fR<dir>
.IP
@@ -79,7 +79,7 @@ mempool will accept (default: 0 = no limit applied)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
doc/release-notes/release-notes-1.0.10-1.md
+11
View File
@@ -0,0 +1,11 @@
Jack Grigg (1):
Disable building Proton in Gitian
Sean Bowe (2):
Revert "Remove an unneeded version workaround as per @str4d's review comment."
Revert "Delete old protocol version constants and simplify code that used them."
Simon Liu (2):
make-release.py: Versioning changes for 1.0.10-1.
make-release.py: Updated manpages for 1.0.10-1.
src/clientversion.h
+1 -1
View File
@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 10
#define CLIENT_VERSION_BUILD 50
#define CLIENT_VERSION_BUILD 51
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
src/deprecation.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define ZCASH_DEPRECATION_H
// Deprecation policy is 4th third-Tuesday after a release
static const int APPROX_RELEASE_HEIGHT = 136000;
static const int APPROX_RELEASE_HEIGHT = 137236;
static const int WEEKS_UNTIL_DEPRECATION = 18;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);