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 376 and 378 #379

Closed
wants to merge 14 commits into from
Closed

Merge 376 and 378 #379

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d7559f
Merge branch 'pcmdi_master'
durack1 Jan 21, 2015
14bfbce
Corrected project on qsub commandline
durack1 Jan 21, 2015
9e9bb52
Merge branch 'pcmdi_master'
durack1 Jan 21, 2015
b0bd200
Merge branch 'master' of github.com:durack1/pcmdi_metrics
durack1 Jan 21, 2015
f43bc20
Merge branch 'pcmdi_master'
durack1 Feb 18, 2015
821eefe
Merge branch 'pcmdi_master'
durack1 Jun 19, 2015
f10ba72
Merge branch 'pcmdi_master'
durack1 Jun 15, 2016
4af3fb8
first pass at fix #316
doutriaux1 Jun 30, 2016
d6e9adb
works and pribts traceback if needed
doutriaux1 Jul 7, 2016
be1eb57
test param file
doutriaux1 Jul 8, 2016
859ea60
first working version
doutriaux1 Jul 13, 2016
7c85bbc
update param all and trying better travis
doutriaux1 Jul 14, 2016
9bc6c46
linux and mac seem diff, this should fix test suite travis on mac
doutriaux1 Jul 14, 2016
e05d7be
Merge remote-tracking branch 'PCMDI/issue_316_regions' into origin/34…
Jul 16, 2016
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
Prev Previous commit
Next Next commit
Merge branch 'pcmdi_master'
  • Loading branch information
@durack1
durack1 committed Jun 15, 2016
commit f10ba72414eea60e7da25d17692b1cee7ad30221

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.