Skip to content

Commit

Permalink
fic merge conflict
Browse files Browse the repository at this point in the history
Merge branch 'master' into cert

# Conflicts:
#	pipe/li191r/li191r_data_source_kafka.yaml
  • Loading branch information
covesturtevant committed Nov 13, 2023
2 parents 6b7e1f4 + ce36e53 commit 5749d78
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pipe/li191r/li191r_data_source_kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ transform:
MONTH_INDEX: "6"
DAY_INDEX: "7"
KAFKA_RETENTION_DAYS: "30"
BUCKET_NAME: "neon-cert-l0-ingest"
secrets:
- name: pachyderm-kafka-auth
env_var: KAFKA_USER
Expand All @@ -24,6 +23,9 @@ transform:
- name: pachyderm-kafka-auth
env_var: KAFKA_BROKER
key: KAFKA_BROKER
- name: l0-bucket
env_var: BUCKET_NAME
key: LO_BUCKET
cmd:
- sh
- "-c"
Expand Down

0 comments on commit 5749d78

Please sign in to comment.