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

12533 quorum 202 #4

Merged
merged 1 commit into from Aug 31, 2011

Conversation

Projects
None yet
2 participants
@bdionne
Contributor

bdionne commented Aug 23, 2011

This requires a fabric branch of the same name

@kocolosk

This comment has been minimized.

Show comment
Hide comment
@kocolosk

kocolosk Aug 29, 2011

Member

LGTM @bdionne. I reverted your whitespace patch because it was causing a spurious merge conflict with master. If you agree with my whitespace changes can you squash this all down into a single patch and re-submit? Also, I think in this case we're pretty decoupled from the fabric work. When it lands, we'll be ready, but it's not like merging this branch is going to break BigCouch in the meantime.

Member

kocolosk commented Aug 29, 2011

LGTM @bdionne. I reverted your whitespace patch because it was causing a spurious merge conflict with master. If you agree with my whitespace changes can you squash this all down into a single patch and re-submit? Also, I think in this case we're pretty decoupled from the fabric work. When it lands, we'll be ready, but it's not like merging this branch is going to break BigCouch in the meantime.

@bdionne

This comment has been minimized.

Show comment
Hide comment
@bdionne

bdionne Aug 31, 2011

Contributor

hmm, there was a whitespace before the code commit also. In any event I removed both

Contributor

bdionne commented Aug 31, 2011

hmm, there was a whitespace before the code commit also. In any event I removed both

@kocolosk

This comment has been minimized.

Show comment
Hide comment
@kocolosk

kocolosk Aug 31, 2011

Member

I think we got our signals crossed here. I was asking you to consider squashing 0b079d4291881b1143c814f5db4847f18204c1c2 into 868e2bd9b00cf7b66528b3c32a6cb5eefb38bafb, but it looks like you threw it away instead. Can you also rewrite the commit message? The body doesn't make much sense once the commit is on master.

Member

kocolosk commented Aug 31, 2011

I think we got our signals crossed here. I was asking you to consider squashing 0b079d4291881b1143c814f5db4847f18204c1c2 into 868e2bd9b00cf7b66528b3c32a6cb5eefb38bafb, but it looks like you threw it away instead. Can you also rewrite the commit message? The body doesn't make much sense once the commit is on master.

@bdionne

This comment has been minimized.

Show comment
Hide comment
@bdionne

bdionne Aug 31, 2011

Contributor

oh, I see, one of the whitespace fixes was just reformatting code. I think I recovered that and rewrote the message

Contributor

bdionne commented Aug 31, 2011

oh, I see, one of the whitespace fixes was just reformatting code. I think I recovered that and rewrote the message

@kocolosk kocolosk merged commit e0391ba into master Aug 31, 2011

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