Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge BRIDGE into develop #226

Merged
merged 33 commits into from
May 20, 2020
Merged

Merge BRIDGE into develop #226

Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6f91aae
Merging develop into master in preparation for beta release (v17.9.0-…
gmao-rreichle Feb 26, 2020
9766ef3
Pointing to tags of GCM_GridComp and GMAO_Shared
gmao-rreichle Feb 26, 2020
d6360ca
Merge pull request #134 from GEOS-ESM/gmao-rreichle-patch-1
weiyuan-jiang Feb 26, 2020
356e4c2
Sync develop to master (via tmp-master-branch-rreichle-20200318) (#155)
gmao-rreichle Mar 18, 2020
3d1924c
Cleaning up sync from develop to master (tmp-master-branch-rreichle-2…
gmao-rreichle Mar 18, 2020
6402a73
bug fix. wrong indent (#157)
weiyuan-jiang Mar 20, 2020
3b84db1
Update README.md (#162)
weiyuan-jiang Apr 3, 2020
79654cf
Merge branch 'master' into rreichle-develop_on_20200414
gmao-rreichle Apr 14, 2020
9906005
Merging develop into master (#172)
gmao-rreichle Apr 15, 2020
f424f43
Merging master into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 15, 2020
4e8d4cf
Syncing develop into BRIDGE_FROM_DEVELOP_TO_MASTER (#188)
gmao-rreichle Apr 23, 2020
26e1e76
Updating Externals.cfg for the develop branch
gmao-rreichle Apr 23, 2020
6056815
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 23, 2020
9c51ec2
New Externals.cfg in prep for v17.9.0-beta.4 tag
gmao-rreichle Apr 23, 2020
36c9451
Merge branch 'master' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle Apr 23, 2020
1f9f8f1
removing white space that was inadvertently...
gmao-rreichle Apr 23, 2020
7031d52
Merging Bridge_from_develop_to_master into master
gmao-rreichle Apr 23, 2020
c34355d
Syncing master into Bridge_from_develop_to_master
gmao-rreichle Apr 23, 2020
c42cd92
Edit Externals.cfg in prep for sync with develop
gmao-rreichle Apr 23, 2020
eafec57
Use EMSA_env v2.1.1+intel19.1.0 (#197)
gmao-rreichle Apr 24, 2020
44d7e17
hotfix for subdaily2daily nc4 file concatenation (post-proc) (#200)
gmao-rreichle Apr 29, 2020
4695c6a
Sync develop into bridge branch (#215)
gmao-rreichle May 11, 2020
acec6c7
Update Externals.cfg in prep for beta.5 pre-release
gmao-rreichle May 11, 2020
16aab82
Merge branch 'BRIDGE_FROM_DEVELOP_TO_MASTER' into master
gmao-rreichle May 11, 2020
f34d5ba
Sync BRIDGE_FROM_DEVELOP_TO_MASTER into master (#216)
gmao-rreichle May 11, 2020
fca64a5
Sync master back into BRIDGE_FROM_DEVELOP_TO_MASTER (#217)
gmao-rreichle May 11, 2020
d45ff75
Update Externals.cfg back to what it should be in develop
gmao-rreichle May 11, 2020
72f741d
Merge branch 'develop' into BRIDGE_FROM_DEVELOP_TO_MASTER
gmao-rreichle May 20, 2020
4a39399
editing Externals.cfg in prep for merge into master
gmao-rreichle May 20, 2020
5b783d1
Merge branch 'BRIDGE_FROM_DEVELOP_TO_MASTER' into master
gmao-rreichle May 20, 2020
bcf8cdc
Merging BRIDGE... into master (#225)
gmao-rreichle May 20, 2020
d09e51d
Merge branch 'master' of github.com:GEOS-ESM/GEOSldas
gmao-rreichle May 20, 2020
c1f746f
synching develop into BRIDGE
gmao-rreichle May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.