Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	pyproject.toml
  • Loading branch information
frankinspace committed Sep 11, 2024
2 parents 0d65168 + 938ce85 commit 51c27f2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release-created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
with:
repository: ${{ github.repository }}
token: ${{ steps.podaac-cicd.outputs.token }}
ref: 'refs/heads/develop'
- uses: actions/setup-python@v5
with:
python-version: '3.10'
Expand Down
14 changes: 12 additions & 2 deletions cmr/netcdf_cmr_umm_s.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,18 @@
],
"SupportedInputFormat": "NETCDF-4"
}
]
],
"Subset": {
"VariableSubset": {
"AllowMultipleValues": false
}
}
},
"OperationMetadata": [
{
"OperationName": "VARIABLE_SUBSETTING"
}
],
"AccessConstraints": "None",
"ServiceKeywords": [
{
Expand Down Expand Up @@ -69,4 +79,4 @@
"Name": "UMM-S",
"Version": "1.5.2"
}
}
}

0 comments on commit 51c27f2

Please sign in to comment.