-
Notifications
You must be signed in to change notification settings - Fork 2
S3UTILS-193 bump bucketclient #339
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
S3UTILS-193 bump bucketclient #339
Conversation
Hello jonathan-gramain,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command: Alternatively, the |
|
/create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/1.15/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.15
$ git merge origin/bugfix/S3UTILS-193-bump-bucketclient
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/1.15/bugfix/S3UTILS-193-bump-bucketclientThe following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/1.16/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.16
$ git merge origin/w/1.15/bugfix/S3UTILS-193-bump-bucketclient
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/1.16/bugfix/S3UTILS-193-bump-bucketclientThe following options are set: create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
c5c63a2 to
2057794
Compare
History mismatchMerge commit #8e2b3338642b3a1772940e14eade006dc5cf39e8 on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_integration_branches |
2057794 to
34a5830
Compare
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the The following options are set: create_integration_branches |
History mismatchMerge commit #8e2b3338642b3a1772940e14eade006dc5cf39e8 on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_integration_branches |
The "mongodb" module is imported directly by some tests, so it has to be declared in package.json with a compatible version. I used the same version than in the current direct dependency of arsenal. Not having this direct dependency caused test failures due to an older mongodb 3 version being hoisted instead for arcane reasons (from another indirect dependency). This caused BSON version incompatibility errors. issue: S3UTILS-193
Issue: S3UTILS-193
34a5830 to
b343c56
Compare
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the The following options are set: create_integration_branches |
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/1.15/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.15
$ git merge origin/bugfix/S3UTILS-193-bump-bucketclient
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/1.15/bugfix/S3UTILS-193-bump-bucketclientThe following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/1.16/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.16
$ git merge origin/w/1.15/bugfix/S3UTILS-193-bump-bucketclient
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/1.16/bugfix/S3UTILS-193-bump-bucketclientThe following options are set: create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
|
/approve |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue S3UTILS-193. Goodbye jonathan-gramain. The following options are set: approve, create_integration_branches |
Also added a missing direct dependency on "mongodb" (see commit message for details)