From 586159b0df1ab41092f62c4f0fdf40c2987d3440 Mon Sep 17 00:00:00 2001
From: brimoor <brimoor@umich.edu>
Date: Fri, 25 Oct 2024 00:05:42 -0400
Subject: [PATCH] release notes

---
 docs/source/release-notes.rst | 39 +++++++++++++++++++++++++++++++++++
 setup.py                      |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/docs/source/release-notes.rst b/docs/source/release-notes.rst
index d78f155c1c..417e4568b0 100644
--- a/docs/source/release-notes.rst
+++ b/docs/source/release-notes.rst
@@ -3,6 +3,45 @@ FiftyOne Release Notes
 
 .. default-role:: code
 
+FiftyOne Teams 2.1.2
+--------------------
+*Released October 25, 2024*
+
+Includes all updates from :ref:`FiftyOne 1.0.2 <release-notes-v1.0.2>`, plus:
+
+- Fixed an issue that prevented `delegation_target` from being properly set when
+  running delegated operations with orchestrator registration enabled
+- Resolved a `RuntimeError` that could occur due to concurrency issues when
+  applying operations that download data from cloud buckets
+
+.. _release-notes-v1.0.2:
+
+FiftyOne 1.0.2
+--------------
+*Released October 25, 2024*
+
+Zoo
+
+- Added :ref:`SAM 2.1 <model-zoo-segment-anything-2.1-hiera-base-plus-image-torch>`
+  to the :ref:`Model Zoo <model-zoo>`
+  `#4979 <https://github.com/voxel51/fiftyone/pull/4979>`_
+- Added :ref:`YOLO11 <ultralytics-instance-segmentation>` to the
+  :ref:`Model Zoo <model-zoo>`
+  `#4899 <https://github.com/voxel51/fiftyone/pull/4899>`_
+- Added generic model architecture and backbone tags to all relevant models
+  :ref:`in the zoo <model-zoo-models>` for easier navigation
+  `#4899 <https://github.com/voxel51/fiftyone/pull/4899>`_
+
+App
+
+- Added a new :ref:`TimelineView <fiftyone.operators.types.TimelineView>` for
+  building custom animations
+  `#4965 <https://github.com/voxel51/fiftyone/pull/4965>`_
+- Fixed overlay z-index and overflow for panels
+  `#4956 <https://github.com/voxel51/fiftyone/pull/4956>`_
+- Fixed bug where timeline name wasn't being forwarded in seek utils
+  `#4975 <https://github.com/voxel51/fiftyone/pull/4975>`_
+
 FiftyOne Teams 2.1.1
 --------------------
 *Released October 14, 2024*
diff --git a/setup.py b/setup.py
index 3652dd44c5..11aed71b06 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = "1.0.1"
+VERSION = "1.0.2"
 
 
 def get_version():