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.

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

Sync master #1296

Merged
merged 38 commits into from May 8, 2015
Merged

Sync master #1296

merged 38 commits into from May 8, 2015

Conversation

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented May 7, 2015

No description provided.

Sam Fries and others added 30 commits Apr 29, 2015
grid var name hadn't been renamed everywhere...
Fixes more typos in raise statements
@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented May 7, 2015

@dlonie @chaosphere2112 @doutriaux1 please review.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented May 7, 2015

@chaosphere2112 is there anything we have to pick up from master into release (so the other way round).

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented May 7, 2015

@aashish24 Nope, I don't think so. Here are the commits in Master that aren't in release currently:

Developer Commit Message SHA
aashish24 Merge remote-tracking branch 'origin/release' cdf05a4
aashish24 Merge pull request #1262 from UV-CDAT/update_master … df355f9
dlonie Add checkFuzzyBoolean representation. … 63f64f1
dlonie Add vcsvtk.Pipeline interface, ported VTKPlots.plot2D to use it. … 7416eab
dlonie Add vectorpipeline plots to vcsvtk submodule. 8090db5
dlonie Add Pipeline1D. 5798113
doutriaux1 Merge pull request #1229 from dlonie/vtk-refactor … 538cf4b

@dlonie's should all be the VTK refactor (along with @doutriaux1's), and it looks like yours are a merge to master from release previously.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented May 7, 2015

@aashish24 I think we're good.

@allisonvacanti
Copy link
Contributor

@allisonvacanti allisonvacanti commented May 7, 2015

LGTM, tests pass.

+1

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented May 7, 2015

Thanks guys 😊

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented May 7, 2015

@aashish24 just approved a branch from @jbeezley care to add it?

@huiwanpnnl
Copy link

@huiwanpnnl huiwanpnnl commented May 7, 2015

I can do it afterwards.. no worries...this is @aashish24

aashish24 added a commit that referenced this issue May 8, 2015
@aashish24 aashish24 merged commit b14e373 into master May 8, 2015
2 of 4 checks passed
@aashish24 aashish24 deleted the sync_master branch May 8, 2015
@aashish24 aashish24 mentioned this pull request May 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants