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

Feature/osis 75 implement get credential #99

Merged
merged 1 commit into from
Aug 18, 2022

Conversation

XinLi0207
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Aug 16, 2022

Codecov Report

Merging #99 (356daab) into development/1.1 (dcf4ef1) will increase coverage by 0.05%.
The diff coverage is 84.61%.

❗ Current head 356daab differs from pull request most recent head 747988f. Consider uploading reports for the commit 747988f to get more accurate results

@@                  Coverage Diff                  @@
##             development/1.1      #99      +/-   ##
=====================================================
+ Coverage              63.40%   63.46%   +0.05%     
+ Complexity               399      398       -1     
=====================================================
  Files                     70       70              
  Lines                   2282     2299      +17     
  Branches                 157      160       +3     
=====================================================
+ Hits                    1447     1459      +12     
- Misses                   766      768       +2     
- Partials                  69       72       +3     
Impacted Files Coverage Δ
...m/scality/osis/vaultadmin/impl/VaultAdminImpl.java 78.50% <0.00%> (ø)
...lity/osis/service/impl/ScalityOsisServiceImpl.java 87.70% <84.95%> (-0.45%) ⬇️
.../com/scality/osis/utils/ScalityModelConverter.java 96.75% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-74-delete-credential branch from 513d231 to d269819 Compare August 16, 2022 14:19
@XinLi0207 XinLi0207 force-pushed the feature/OSIS-75-implement-getCredential branch from fa2e0e2 to 7cd31ba Compare August 16, 2022 14:22
Copy link

@williamlardier williamlardier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-74-delete-credential branch from d269819 to dcf4ef1 Compare August 18, 2022 09:23
Base automatically changed from feature/OSIS-74-delete-credential to development/1.1 August 18, 2022 09:28
@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

Hello xinliscality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

Conflict

There is a conflict between your branch feature/OSIS-75-implement-getCredential and the
destination branch development/1.1.

Please resolve the conflict on the feature branch (feature/OSIS-75-implement-getCredential).

git fetch && \
git checkout origin/feature/OSIS-75-implement-getCredential && \
git merge origin/development/1.1

Resolve merge conflicts and commit

git push origin HEAD:feature/OSIS-75-implement-getCredential

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-75-implement-getCredential branch from 356daab to 747988f Compare August 18, 2022 09:44
@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@XinLi0207
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/1.1

The following branches will NOT be impacted:

  • development/1.0

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/1.1

The following branches have NOT changed:

  • development/1.0

Please check the status of the associated issue OSIS-75.

Goodbye xinliscality.

@bert-e bert-e merged commit 747988f into development/1.1 Aug 18, 2022
@bert-e bert-e deleted the feature/OSIS-75-implement-getCredential branch August 18, 2022 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants