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

OGM-270 [MongoDB] Expose the WriteConcern settings to the configuration #171

Closed
wants to merge 1 commit into from

Conversation

gscheibel
Copy link
Contributor

No description provided.

@Sanne
Copy link
Member

Sanne commented Apr 17, 2013

@gscheibel because of checkstyle being now activated in master I'd need you to rebase this pull.

Since @DavideD made lots of small changes this is now conflicting.. Davide can you help with the git process? It's not too fair to push all the conflicts madness to Guillaume, and this will teach you about the consequences of style changes :-P

@DavideD
Copy link
Member

DavideD commented Apr 17, 2013

@gscheibel , conflicts shouldn't be too hard to fix since I've mainly removed/added spaces but let me know if you need help.

@DavideD
Copy link
Member

DavideD commented Apr 18, 2013

@gscheibel, to save you some time I've rebased the pull and fix the violations on this branch: https://github.com/DavideD/hibernate-ogm/commits/gscheibel-OGM-270.

@gscheibel
Copy link
Contributor Author

@DavideD I ran a diff between your 'gscheibel-OGM-270' brnach and my 'OGM-270' and I saw some style differences (whitespaces deleted etc.) should I reformat the code after having rebased your branch ?

@DavideD
Copy link
Member

DavideD commented Apr 19, 2013

I don't understand...do you want to add again the white spaces I've removed? :)

Unless I did something wrong, the branch I've done fix all checkstyle violations and apply the correct formatter. I've created it because I thought it might help you but you are free to change whatever you like as long as it follow the conventions.

@Hibernate-CI
Copy link
Contributor

Can one of the admins verify this patch?

@DavideD
Copy link
Member

DavideD commented May 1, 2013

@gscheibel There are some conflicts with the latest master...could you fix them?

@gscheibel
Copy link
Contributor Author

@Sanne I would prefer to wait OGM-282 is merged so I can refactor this pull request with the new configuration parsing

@Sanne
Copy link
Member

Sanne commented May 1, 2013

@gscheibel good point. Let's close this one for the moment then: distracts me from reviewing the other ones ;)
(of course don't delete your code!)

@Sanne Sanne closed this May 1, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants