From b508742d761a02741eda0409b5e9d6ccd46d57bc Mon Sep 17 00:00:00 2001
From: Luis Perez <luisp@yelp.com>
Date: Thu, 9 Jan 2025 09:22:14 -0800
Subject: [PATCH] Released 3.1.2 via make release

---
 Makefile         |  2 +-
 debian/changelog | 11 +++++++++++
 tron/__init__.py |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 08072df45..2a3d4d313 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Edit this release and run "make release"
-RELEASE=3.1.1
+RELEASE=3.1.2
 
 SHELL=/bin/bash
 
diff --git a/debian/changelog b/debian/changelog
index 4b77acd47..7d50c5b99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tron (3.1.2) jammy; urgency=medium
+
+  * 3.1.2 tagged with 'make release'
+    Commit: Bump task_processing to v1.3.1 for capability fix (#1020)
+    Just like Yelp/paasta#3972 and Yelp/paasta#3973, we need to ensure
+    that there are no duplicates between cap_add and cap_drop -
+    otherwise, the cap_drop entry will "win" and the duplicate
+    capability will not be added.
+
+ -- Luis Perez <luisp@yelp.com>  Thu, 09 Jan 2025 09:21:33 -0800
+
 tron (3.1.1) jammy; urgency=medium
 
   * 3.1.1 tagged with 'make release'
diff --git a/tron/__init__.py b/tron/__init__.py
index 73c3fdecc..c3acfcd76 100644
--- a/tron/__init__.py
+++ b/tron/__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__ = "3.1.1"
+__version__ = "3.1.2"