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

Fwdport 7.2 to 7.4 #175

Closed
wants to merge 5 commits into from
Closed

Fwdport 7.2 to 7.4 #175

wants to merge 5 commits into from

Conversation

jonathan-gramain
Copy link
Contributor

No description provided.

ThibaultRiviere and others added 5 commits November 20, 2017 14:05
@ThibaultRiviere
fix(deps): use the 7.2 dependencies
70a8413
@rahulreddy
Merge pull request #138 from scality/fix/dependencies
77d4954 
Fix/dependencies
@jonathan-gramain
bf: fix concurrency issue with log reader
7d8f7c6 
Call QueuePopulatorExtension.setBatch() every time new entries are received,
because multiple readers can be intermingled sending their respective data,
and although the LogReader class is managing a single reader, the extensions
`batch` field is global to all readers, so it has to be set every time.
@ironman-machine
merge #169
7793682
@jonathan-gramain
Merge remote-tracking branch 'origin/rel/7.2' into fwdport_7.2_to_7.4
cf50b45
@jonathan-gramain
Copy link
Contributor Author

@ironman-machine r+

@ironman-machine
Copy link
Contributor

Hello @jonathan-gramain

"r+": Success

@ironman-machine
Copy link
Contributor

💔 ☔ Cannot trigger CI: trigger_ci_build error: request failed with status code: 400

@jonathan-gramain
Copy link
Contributor Author

@ironman-machine r- r+

@ironman-machine
Copy link
Contributor

Hello @jonathan-gramain

"r-": Success
"r+": Success

@ironman-machine
Copy link
Contributor

💔 ☔ Cannot trigger CI: trigger_ci_build error: request failed with status code: 400

@jonathan-gramain
Copy link
Contributor Author

@ironman-machine r-

@ironman-machine
Copy link
Contributor

Hello @jonathan-gramain

"r-": Success

@jonathan-gramain
Copy link
Contributor Author

@ironman-machine
DEFAULT_BRANCH=rel/7.4
r+

@ironman-machine
Copy link
Contributor

Hello @jonathan-gramain

"DEFAULT_BRANCH=rel/7.4": Success
"r+": Success

@ironman-machine
Copy link
Contributor

💔 ☔ Cannot trigger CI: trigger_ci_build error: request failed with status code: 400

@ghost
Copy link

ghost commented Feb 2, 2018

Maybe we didn't push integration's ultron/rel/7.4 branch when creating the rel/7.4 branch. Retry when you've pushed it, should work then.

@jonathan-gramain
Copy link
Contributor Author

There is no rel/7.4 branch yet on Integration, that should explain. Shall I simply create it from the current master?

@jonathan-gramain
Copy link
Contributor Author

jonathan-gramain commented Feb 2, 2018 •
edited
Loading

and ultron branch

@ghost
Copy link

ghost commented Feb 2, 2018

Yes. I'll do it today if it's not created yet.
I'll discuss that with @harperscality , I think she was unaware that this was a requirement for further development :)

@jonathan-gramain
Copy link
Contributor Author

@ironman-machine r- r+

@ironman-machine
Copy link
Contributor

Hello @jonathan-gramain

"r-": Success
"r+": Success

@ironman-machine
Copy link
Contributor

This pull request isn't mergeable:

CONFLICT (content): Merge conflict in package.json

@jonathan-gramain
Copy link
Contributor Author

Not needed anymore, done in #170.

@jonathan-gramain jonathan-gramain deleted the fwdport_7.2_to_7.4 branch February 3, 2018 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philipyoo philipyoo philipyoo approved these changes

@JianqinWang JianqinWang JianqinWang 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.
6 participants
@jonathan-gramain @ironman-machine @JianqinWang @philipyoo @ThibaultRiviere @rahulreddy