diff options
| author | Matt Davis <nitzmahone@users.noreply.github.com> | 2018-05-22 01:14:53 +0200 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2018-05-22 01:14:53 +0200 |
| commit | e4edb2842a8816a3eed596aea1c28aa769a31e9d (patch) | |
| tree | 6e1407782d7a1360345e078a4cee7808d365002a /.gitattributes | |
| parent | Ios test fixes (#40503) (diff) | |
| download | ansible-e4edb2842a8816a3eed596aea1c28aa769a31e9d.tar.xz ansible-e4edb2842a8816a3eed596aea1c28aa769a31e9d.zip | |
2.6 changelog gen/version/root dir cleanup (#40421)
* patched in changelog gen stuff from stable-2.5
* Makefile updates
* release.py as single-source-of-truth
* Remove obsolete ansible-core-sitemap.xml file.
* Move ROADMAP.rst into README.rst.
* dynamic rpm changelog, zap old deb/rpm changelogs
* fix changelog in MANIFEST.in
* Remove obsolete hacking/update.sh script.
* Remove ref to deleted authors script.
* Remove ref to removed module-formatter script.
* Update headings to match script names.
* MANIFEST.in cleanup
* removed RELEASES.txt and versions.yml
* removed obsolete release generation playbook/bits (not used since 2.5)
* misc Makefile cleanup
* speculative changes to DEB versioning
* allow override of DEB_VERSION/DEB_RELEASE
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 150db1aef4..7d5be40ba5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,2 @@ -CHANGELOG.md merge=union .github/ export-ignore hacking/ export-ignore -ticket-stubs/ export-ignore |