From b3656c22ac2acfe2997bd39ea5e42becc3e255c4 Mon Sep 17 00:00:00 2001
From: Daniel Goldstein <danielgold95@gmail.com>
Date: Thu, 7 Sep 2023 09:56:12 -0400
Subject: [PATCH 1/2] [hailtop] Fix defaulting to hail.is when the user has no
 deploy-config or domain specified

---
 hail/python/hailtop/config/deploy_config.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hail/python/hailtop/config/deploy_config.py b/hail/python/hailtop/config/deploy_config.py
index bd3eb4c139c..5f6dee9de1b 100644
--- a/hail/python/hailtop/config/deploy_config.py
+++ b/hail/python/hailtop/config/deploy_config.py
@@ -16,8 +16,6 @@ def env_var_or_default(name: str, defaults: Dict[str, str]) -> str:
 class DeployConfig:
     @staticmethod
     def from_config(config: Dict[str, str]) -> 'DeployConfig':
-        if 'domain' not in config:
-            config['domain'] = 'hail.is'
         return DeployConfig(
             env_var_or_default('location', config),
             env_var_or_default('default_namespace', config),
@@ -48,7 +46,7 @@ def from_config_file(config_file=None) -> 'DeployConfig':
             config = {
                 'location': 'external',
                 'default_namespace': 'default',
-                'domain': get_user_config().get('global', 'domain', fallback=None),
+                'domain': get_user_config().get('global', 'domain', fallback='hail.is'),
             }
         return DeployConfig.from_config(config)
 

From 6ab26dd7b339ffb6c3d89dc1a29360ccb6899731 Mon Sep 17 00:00:00 2001
From: Daniel Goldstein <danielgold95@gmail.com>
Date: Thu, 7 Sep 2023 10:13:12 -0400
Subject: [PATCH 2/2] make changelog updates

---
 hail/Makefile                                 | 2 +-
 hail/python/hail/docs/change_log.md           | 9 +++++++++
 hail/python/hailtop/batch/docs/change_log.rst | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hail/Makefile b/hail/Makefile
index 3eeb4f1667c..1a93927f1f6 100644
--- a/hail/Makefile
+++ b/hail/Makefile
@@ -14,7 +14,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 SCALA_VERSION ?= 2.12.15
 SPARK_VERSION ?= 3.3.0
 HAIL_MAJOR_MINOR_VERSION := 0.2
-HAIL_PATCH_VERSION := 121
+HAIL_PATCH_VERSION := 122
 HAIL_PIP_VERSION := $(HAIL_MAJOR_MINOR_VERSION).$(HAIL_PATCH_VERSION)
 HAIL_VERSION := $(HAIL_PIP_VERSION)-$(SHORT_REVISION)
 ELASTIC_MAJOR_VERSION ?= 7
diff --git a/hail/python/hail/docs/change_log.md b/hail/python/hail/docs/change_log.md
index ad76c6fe136..380e0832441 100644
--- a/hail/python/hail/docs/change_log.md
+++ b/hail/python/hail/docs/change_log.md
@@ -52,6 +52,15 @@ supports.
 policy. Their functionality or even existence may change without notice. Please contact us if you
 critically depend on experimental functionality.**
 
+## Version 0.2.122
+
+Released 2023-09-07
+
+### Bug Fixes
+- (hail#13585) Fix bug introduced in 0.2.121 where Query-on-Batch
+  users could not make requests to `batch.hail.is` without a domain configuration
+  set.
+
 ## Version 0.2.121
 
 Released 2023-08-31
diff --git a/hail/python/hailtop/batch/docs/change_log.rst b/hail/python/hailtop/batch/docs/change_log.rst
index c15e9a8ec4d..37cee3d255a 100644
--- a/hail/python/hailtop/batch/docs/change_log.rst
+++ b/hail/python/hailtop/batch/docs/change_log.rst
@@ -15,6 +15,11 @@ versions. In particular, Hail officially supports:
 Change Log
 ==========
 
+**Version 0.2.122**
+
+- (`#13565 <https://github.com/hail-is/hail/pull/13565>`__) Users can now use VEP images from the `hailgenetics` DockerHub
+  in Hail Batch.
+
 **Version 0.2.121**
 
 - (`#13396 <https://github.com/hail-is/hail/pull/13396>`__) Non-spot instances can be requested via the :meth:`.Job.spot` method.