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 0.3 in master #81

Merged
merged 8 commits into from
Feb 8, 2018
Merged

Merge 0.3 in master #81

merged 8 commits into from
Feb 8, 2018

Conversation

JeffreyDevloo
Copy link
Contributor

No description provided.

jeroenmaelbrancke and others added 8 commits February 7, 2018 10:21
@jeroenmaelbrancke @JeffreyDevloo
Merge pull request #73 from openvstorage/extra_features_setup_json
0672500 
Extra features setup json
(cherry picked from commit 0f6561f)

# Conflicts:
#	helpers/storagedriver.py
#	setup/vpool.py
@JeffreyDevloo
Remove the newer logger and replace it with the old one
5439826
@JeffreyDevloo
Merge pull request #78 from openvstorage/0.3.x_cherry_pick_voldr
952f5c6 
Merge pull request #73 from openvstorage/extra_features_setup_json
@jeroenmaelbrancke
Change the volumedriver config after the complete setup of the vpools…
2c22485 
… (extending)
@jeroenmaelbrancke
Unused imports and formatting
55b276c
@jeroenmaelbrancke
Merge pull request #79 from openvstorage/fix_write_buffer_problem
fe41482 
fix write buffer problems
@JeffreyDevloo
Merge remote-tracking branch 'origin/0.3.x' into merge_0.3_in_master
9083086 
# Conflicts:
#	helpers/storagedriver.py
@JeffreyDevloo
Bring 0.3 into master
9683f10
@JeffreyDevloo JeffreyDevloo merged commit 46c143a into master Feb 8, 2018
@JeffreyDevloo JeffreyDevloo deleted the merge_0.3_in_master branch February 8, 2018 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjovdnbos sjovdnbos sjovdnbos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JeffreyDevloo @sjovdnbos @jeroenmaelbrancke