Auto merge of zcash#2562 - arielgabizon:release-v1.0.11-rc1, r=daira

zkbot · zkbot · commit 2a42478bff3e · 2017-08-01T12:37:26.000-07:00
Release v1.0.11 rc1
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 1.0.10-1
+Zcash 1.0.11-rc1
 =============
 
 What is Zcash?
diff --git a/configure.ac b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 10)
-define(_CLIENT_VERSION_BUILD, 51)
+define(_CLIENT_VERSION_REVISION, 11)
+define(_CLIENT_VERSION_BUILD, 25)
 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)
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+zcash (1.0.11~rc1) stable; urgency=medium
+
+  * 1.0.11-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Tue, 01 Aug 2017 17:12:52 +0200
+
 zcash (1.0.10+1) stable; urgency=medium
 
   * 1.0.10-1 release.
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-1.0.10-1"
+name: "zcash-1.0.11-rc1"
 enable_cache: true
 distro: "debian"
 suites:
diff --git a/doc/authors.md b/doc/authors.md
@@ -1,12 +1,12 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (428)
-Simon Liu (266)
+Jack Grigg (443)
+Simon Liu (269)
 Sean Bowe (188)
-Daira Hopwood (95)
+Daira Hopwood (102)
 Taylor Hornby (65)
-Wladimir J. van der Laan (60)
+Wladimir J. van der Laan (61)
 Nathan Wilcox (51)
 Jay Graber (49)
 Jonas Schnelli (48)
@@ -42,9 +42,11 @@ Joe Turgeon (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
 Gavin Andresen (2)
+Ariel Gabizon (2)
 Amgad Abdelhafez (2)
 zathras-crypto (1)
 unsystemizer (1)
+practicalswift (1)
 mruddy (1)
 mrbandrews (1)
 kazcw (1)
diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
@@ -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-1" "User Commands"
+.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11-rc1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v1.0.10-1
+zcash-cli \- manual page for zcash-cli v1.0.11-rc1
 .SH DESCRIPTION
-Zcash RPC client version v1.0.10\-1
+Zcash RPC client version v1.0.11\-rc1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/index.html>.
diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
@@ -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-1" "User Commands"
+.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11-rc1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.0.10-1
+zcash-tx \- manual page for zcash-tx v1.0.11-rc1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.0.10\-1
+Zcash zcash\-tx utility version v1.0.11\-rc1
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]
diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
@@ -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-1" "User Commands"
+.TH ZCASHD "1" "August 2017" "zcashd v1.0.11-rc1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v1.0.10-1
+zcashd \- manual page for zcashd v1.0.11-rc1
 .SH DESCRIPTION
-Zcash Daemon version v1.0.10\-1
+Zcash Daemon version v1.0.11\-rc1
 .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\-1)
+\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11\-rc1)
 .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\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
diff --git a/doc/release-notes/release-notes-1.0.11-rc1.md b/doc/release-notes/release-notes-1.0.11-rc1.md
@@ -0,0 +1,44 @@
+Changelog
+=========
+
+Ariel Gabizon (2):
+      make-release.py: Versioning changes for 1.0.11-rc1.
+      make-release.py: Updated manpages for 1.0.11-rc1.
+
+Daira Hopwood (7):
+      Clean up imports to be pyflakes-checkable. fixes #2450
+      For unused variables reported by pyflakes, either remove the variable,     suppress the warning, or fix a bug (if the wrong variable was used).     refs #2450
+      Cosmetics (trailing whitespace, comment conventions, etc.)
+      Alert 1004 (version 1.0.10 only)
+      Remove UPnP support. fixes #2500
+      Change wording in Security Warnings section of README.md.
+      Document our criteria for adding CI workers. closes #2499
+
+Jack Grigg (15):
+      Pull in temporary release notes during the release process
+      Ansible playbook for installing Zcash dependencies and Buildbot worker
+      Variable overrides for Debian, Ubuntu and Fedora
+      Variable overrides for FreeBSD
+      Simplify Python installation, inform user if they need to manually configure
+      Add test for issue #2444
+      Add Buildbot worker setup to Ansible playbook
+      Add steps for setting up a latent worker on Amazon EC2
+      Add pyblake2 to required Python modules
+      Remove Buildbot version from host file
+      Add a separate Buildbot host info template for EC2
+      Add pyflakes to required Python modules
+      Add block download progress to metrics UI
+      Correct and extend EstimateNetHeightInner tests
+      Improve network height estimation
+
+Simon Liu (3):
+      Closes #2446 by adding generated field to listunspent.
+      Fixes #2519. When sending from a zaddr, minconf cannot be zero.
+      Fixes #2480. Null entry in map was dereferenced leading to a segfault.
+
+Wladimir J. van der Laan (1):
+      rpc: Add WWW-Authenticate header to 401 response
+
+practicalswift (1):
+      Net: Fix resource leak in ReadBinaryFile(...)
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,8 +17,8 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 10
-#define CLIENT_VERSION_BUILD 51
+#define CLIENT_VERSION_REVISION 11
+#define CLIENT_VERSION_BUILD 25
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true
diff --git a/src/deprecation.h b/src/deprecation.h
@@ -6,7 +6,7 @@
 #define ZCASH_DEPRECATION_H
 
 // Deprecation policy is 4th third-Tuesday after a release
-static const int APPROX_RELEASE_HEIGHT = 137236;
+static const int APPROX_RELEASE_HEIGHT = 159000;
 static const int WEEKS_UNTIL_DEPRECATION = 18;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Zcash 1.0.10-1`
	`1`	`+Zcash 1.0.11-rc1`
`2`	`2`	`=============`
`3`	`3`
`4`	`4`	`What is Zcash?`