Skip to content

Commit 47d9bac

Browse files
authored
Merge branch 'main' into renovate/psycopg2-binary-2.x
2 parents cce8736 + 749fdc3 commit 47d9bac

7 files changed

Lines changed: 4 additions & 368 deletions

File tree

.kokoro/python2.7/common.cfg

Lines changed: 0 additions & 54 deletions
This file was deleted.

.kokoro/python2.7/continuous.cfg

Lines changed: 0 additions & 21 deletions
This file was deleted.

.kokoro/python2.7/periodic.cfg

Lines changed: 0 additions & 22 deletions
This file was deleted.

.kokoro/python2.7/presubmit.cfg

Lines changed: 0 additions & 21 deletions
This file was deleted.

appengine/standard/noxfile-template.py

Lines changed: 0 additions & 246 deletions
This file was deleted.

composer/tools/composer_migrate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def unpause_dag(
108108
dag_id: str,
109109
environment_name: str,
110110
) -> Any:
111-
"""Unpauses all DAGs in a Composer environment."""
111+
"""Unpauses a DAG in a Composer environment."""
112112
command = (
113113
f"CLOUDSDK_API_ENDPOINT_OVERRIDES_COMPOSER={self.sdk_endpoint} gcloud"
114114
" composer environments run"
@@ -363,7 +363,7 @@ def main(
363363
pprint.pformat(target_environment),
364364
)
365365
logger.warning(
366-
"Composer 3 environnment workloads config may be different from the"
366+
"Composer 3 environment workloads config may be different from the"
367367
" source environment."
368368
)
369369
logger.warning(
@@ -413,7 +413,7 @@ def main(
413413
client.load_snapshot(target_environment_name, snapshot_path)
414414
logger.info("Snapshot loaded.")
415415

416-
# 6. Unpase DAGs in the new environment
416+
# 6. Unpause DAGs in the new environment
417417
logger.info("STEP 6: Unpausing DAGs in the new environment...")
418418
all_dags_present = False
419419
# Wait until all DAGs from source environment are visible.

0 commit comments

Comments
 (0)