diff --git a/debian/changelog b/debian/changelog index 4842bb41c7..26847d24a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +paasta-tools (0.97.26) xenial; urgency=medium + + * 0.97.26 tagged with 'make release' + Commit: Merge branch "master" of github.com:Yelp/paasta into + u/krall/PAASTA-17045 + + -- Evan Krall Fri, 30 Oct 2020 11:40:57 -0700 + paasta-tools (0.97.25) xenial; urgency=medium * 0.97.25 tagged with 'make release' diff --git a/docs/source/generated/paasta_tools.kubernetes.rst b/docs/source/generated/paasta_tools.kubernetes.rst index 80c82594fc..d7203e9881 100644 --- a/docs/source/generated/paasta_tools.kubernetes.rst +++ b/docs/source/generated/paasta_tools.kubernetes.rst @@ -9,13 +9,6 @@ Subpackages paasta_tools.kubernetes.application paasta_tools.kubernetes.bin -Submodules ----------- - -.. toctree:: - - paasta_tools.kubernetes.trace - Module contents --------------- diff --git a/paasta_tools/__init__.py b/paasta_tools/__init__.py index 9c5a408f37..5fa6cedc88 100644 --- a/paasta_tools/__init__.py +++ b/paasta_tools/__init__.py @@ -17,4 +17,4 @@ # setup phase, the dependencies may not exist on disk yet. # # Don't bump version manually. See `make release` docs in ./Makefile -__version__ = "0.97.25" +__version__ = "0.97.26" diff --git a/yelp_package/Makefile b/yelp_package/Makefile index 3e163713bf..ff8be7992f 100644 --- a/yelp_package/Makefile +++ b/yelp_package/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # Edit this release and run "make release" -RELEASE=0.97.25 +RELEASE=0.97.26 SHELL=/bin/bash