From 15ca15f38314038f58a379d0c1b1b8c91d90269d Mon Sep 17 00:00:00 2001
From: Tadeas Kmenta <tadeas.kmenta@zel.cash>
Date: Wed, 29 Nov 2023 23:45:29 +0800
Subject: [PATCH] make-release.py: Updated release notes and changelog for
 7.0.0.

---
 contrib/debian/changelog                 |  6 +++
 doc/authors.md                           |  6 +--
 doc/release-notes/release-notes-7.0.0.md | 51 ++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 doc/release-notes/release-notes-7.0.0.md

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 437c703d4..48dfd9d34 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+flux (7.0.0) stable; urgency=medium
+
+  * 7.0.0 release.
+
+ -- Zel Foundation <info@zel.cash>  Wed, 29 Nov 2023 23:45:29 +0800
+
 flux (6.2.0) stable; urgency=medium
 
   * 6.2.0 release.
diff --git a/doc/authors.md b/doc/authors.md
index 25c097ff6..9ef101fce 100644
--- a/doc/authors.md
+++ b/doc/authors.md
@@ -1,9 +1,9 @@
 Flux Contributors
 ==================
 
-Jeremy "Blondfrogs" Anderson (141)
-Tadeas Kmenta (63)
-Tom Moulton (36)
+Jeremy "Blondfrogs" Anderson (175)
+Tadeas Kmenta (64)
+Tom Moulton (38)
 Miles Manley (18)
 Cabecinha84 (7)
 Jack Grigg (4)
diff --git a/doc/release-notes/release-notes-7.0.0.md b/doc/release-notes/release-notes-7.0.0.md
new file mode 100644
index 000000000..9dbb7dd7b
--- /dev/null
+++ b/doc/release-notes/release-notes-7.0.0.md
@@ -0,0 +1,51 @@
+Changelog
+=========
+
+Tadeas Kmenta (3):
+      Update .travis.yml
+      make-release.py: Versioning changes for 7.0.0.
+      make-release.py: Updated manpages for 7.0.0.
+
+Tadeas Kmenta (1):
+      update download url
+
+Tom Moulton (2):
+      Revert "Revert "Patch boost thread_data for ubuntu 21.10 build""
+      Updated test code to use additional coins to test limits of MAX_MONEY all GTests now pass again 100%
+
+Jeremy "Blondfrogs" Anderson (34):
+      Start P2SH fluxnodes
+      Add support for new fluxnode tx format, create fork code
+      Add all core checks for P2SH nodes
+      Add Google Test for P2SH nodes
+      Tests, and fixes
+      Add better logging
+      Make comparison == instead of XOR
+      Build rpc calls for building, signing, sending p2shnode start transactions
+      Add descriptions to new rpc calls
+      Update timestamp to match block hash timestamp
+      Remove XOR
+      Rename 1
+      Rename 2
+      Rename 3
+      Remove collateralpubkey in p2sh start txes
+      Remove collateralpub req when p2sh, add additional checks
+      Add latest benchmark key
+      Set new testnet chainparams for 1 minute blocks
+      Add new testnet block into chainparams
+      upgrade.cpp
+      Update proto version, and testnet blockchain checks
+      Add rawtransaction json
+      Remove maptxheighttracker, add some logging
+      Remove DosHeights tracker map
+      Make a uint so we can use the 8th bit
+      Not change type, do bitmask check
+      Update timestamp for new publickey
+      Flux defaults to version 5 tx
+      Fix rpc bug, fix regtest
+      GTests now pass 100%
+      Update MAX_MONEY to correct value
+      Createconfirmationtransaction now gets fluxbench sign, and broadcasts
+      Final timestamp, blockheight for P2SH Fork
+      add back inital blockchain sync check
+