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

Conversation

Projects
None yet
8 participants
@aashish24
Contributor

aashish24 commented May 7, 2015

No description provided.

Sam Fries and others added some commits Apr 29, 2015

Merge pull request #1247 from UV-CDAT/issue_1245_meshfill_grid_error
grid var name hadn't been renamed everywhere...
Merge pull request #1258 from chaosphere2112/colorpicker_renderer_sel…
…ection

Colorpicker renderer selection
Merge pull request #1270 from UV-CDAT/fix-cdms-exceptions
Fixes more typos in raise statements
Sam Fries

chaosphere2112 and others added some commits May 5, 2015

Merge pull request #1242 from chaosphere2112/text_resizing_window_place
Fixed resizing issue and added two tests to cover it
@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 7, 2015

@dlonie @chaosphere2112 @doutriaux1 please review.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 7, 2015

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

@chaosphere2112

This comment has been minimized.

Contributor

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

This comment has been minimized.

Member

doutriaux1 commented May 7, 2015

@aashish24 I think we're good.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented May 7, 2015

LGTM, tests pass.

+1

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 7, 2015

Thanks guys 😊

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 7, 2015

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

@huiwanpnnl

This comment has been minimized.

huiwanpnnl commented May 7, 2015

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

aashish24 added a commit that referenced this pull request May 8, 2015

@aashish24 aashish24 merged commit b14e373 into master May 8, 2015

2 of 4 checks passed

continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
continuous-integration/kitware-buildbot/uvcdat-test-laptop-linux-release/ Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@aashish24 aashish24 deleted the sync_master branch May 8, 2015

@aashish24 aashish24 referenced this pull request May 22, 2015

Merged

Issue 1312 tag repos #1321

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment