[Asterisk-code-review] build: Revise CHANGES and UPGRADE.txt handling. (...asterisk[master])

[Benjamin Keith Ford]

Benjamin Keith Ford has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/10945 )

Change subject: build: Revise CHANGES and UPGRADE.txt handling.
......................................................................

build: Revise CHANGES and UPGRADE.txt handling.

This changes the way that we handle adding changes to CHANGES and
UPGRADE.txt. The reason for this is because whenever someone needed to
make a change to one of these files and someone else had already done
so, you would run into merge conflicts. With this new setup, there will
never be merge conflicts since all changes will be documented in the
doc/<file>-staging directory. The release script is now responsible for
merging all of these changes into the appropriate files.

There is a special format that these files have to follow in order to be
parsed. The files do not need to have a meaningful name, but it is
strongly recommended. For example, if you made a change to pjsip, you
may have something like this "res_pjsip_relative_title", where
"relative_title" is something more descriptive than that. Inside each
file, you will need a subject line for your change, followed by a
description. There can be multiple subject lines. The file may look
something like this:

   Subject: res_pjsip
   Subject: Core

   A description that explains the changes made and why. The release
   script will handle the bulleting and section separators!

   You can still separate with new lines within your
   description.

The headers ("Subject" and "Master-Only") are case sensative, but the
value for "Master-Only" ("true" or "True") is not.

For more information, check out the wiki page:
https://wiki.asterisk.org/wiki/display/AST/CHANGES+and+UPGRADE.txt

ASTERISK-28111 #close

Change-Id: I19cf4b569321c88155a65e9b0b80f6d58075dd47
---
M CHANGES
D UPGRADE-1.2.txt
D UPGRADE-1.4.txt
D UPGRADE-1.6.txt
D UPGRADE-1.8.txt
D UPGRADE-10.txt
D UPGRADE-11.txt
D UPGRADE-12.txt
D UPGRADE-13.txt
D UPGRADE-14.txt
D UPGRADE-15.txt
D UPGRADE-16.txt
M UPGRADE.txt
M doc/CHANGES-staging/README.md
A doc/CHANGES-staging/bridging_stasis_cache.txt
A doc/CHANGES-staging/chan_sip_deprecated.txt
A doc/CHANGES-staging/channels_stasis_cache.txt
M doc/UPGRADE-staging/README.md
A doc/UPGRADE-staging/applications_jabberstatus.txt
A doc/UPGRADE-staging/bridging_stasis_cache.txt
A doc/UPGRADE-staging/chan_sip_deprecated.txt
A doc/UPGRADE-staging/channels_stasis_cache.txt
A doc/UPGRADE-staging/func_callerid_callerpres.txt
A doc/UPGRADE-staging/res_parking_parkingslot.txt
A doc/UPGRADE-staging/res_xmpp_jabberstatus.txt
25 files changed, 2,792 insertions(+), 3,011 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit




-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/10945
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I19cf4b569321c88155a65e9b0b80f6d58075dd47
Gerrit-Change-Number: 10945
Gerrit-PatchSet: 4
Gerrit-Owner: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190416/3a55c2c3/attachment.html>