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

feature: ZENKO-315 Add NFS property to BucketInfo #509

Merged
merged 1 commit into from
Jun 23, 2018
Merged

feature: ZENKO-315 Add NFS property to BucketInfo #509

merged 1 commit into from
Jun 23, 2018

Conversation

bennettbuchanan
Copy link

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Jun 19, 2018

Hello bennettbuchanan,

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

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jun 19, 2018

Waiting for approval

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

  • 2 peers

philipyoo
philipyoo previously approved these changes Jun 19, 2018
View reviewed changes
Copy link
Contributor

@philipyoo philipyoo left a comment

Choose a reason for hiding this comment

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

lgtm, do we need to update modelVersion number?

@ironman-machine ironman-machine dismissed philipyoo’s stale review June 19, 2018 21:52

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan bennettbuchanan mentioned this pull request Jun 20, 2018
Merged
@bennettbuchanan bennettbuchanan force-pushed the feature/ZENKO-315/CRRWithoutVersioning branch from 00092b9 to 0de3f47 Compare June 20, 2018 18:34
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

ploki
ploki previously approved these changes Jun 21, 2018
View reviewed changes
@bennettbuchanan bennettbuchanan force-pushed the feature/ZENKO-315/CRRWithoutVersioning branch from 0de3f47 to 296b668 Compare June 21, 2018 21:47
@ironman-machine ironman-machine dismissed ploki’s stale review June 21, 2018 21:47

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan bennettbuchanan force-pushed the feature/ZENKO-315/CRRWithoutVersioning branch from 296b668 to 2fab6a8 Compare June 21, 2018 21:49
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan bennettbuchanan force-pushed the feature/ZENKO-315/CRRWithoutVersioning branch from 2fab6a8 to fedc555 Compare June 21, 2018 21:52
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan bennettbuchanan mentioned this pull request Jun 21, 2018
Merged
jonathan-gramain
jonathan-gramain reviewed Jun 22, 2018
View reviewed changes
lib/models/ObjectMD.js
@@ -706,7 +707,7 @@ class ObjectMD {
*/
setReplicationInfo(replicationInfo) {
const { status, backends, content, destination, storageClass, role,
storageType, dataStoreVersionId } = replicationInfo;
storageType, dataStoreVersionId, isNFS } = replicationInfo;
Copy link
Contributor

Choose a reason for hiding this comment

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

fromNFS could read better, along with setReplicationFromNFS()?

Copy link
Contributor

Choose a reason for hiding this comment

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

we "cross repository" agreed on "isNFS" to carry the fact that a bucket might be exported with NFS.

@ironman-machine ironman-machine dismissed jonathan-gramain’s stale review June 22, 2018 18:36

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ironman-machine
Copy link
Contributor 

CONFLICT (add/add): Merge conflict in tests/unit/models/object.js
CONFLICT (add/add): Merge conflict in tests/unit/models/BucketInfo.js
CONFLICT (add/add): Merge conflict in tests/functional/metadataProxy/routesToMem.js
CONFLICT (add/add): Merge conflict in lib/storage/metadata/proxy/BucketdRoutes.js
CONFLICT (add/add): Merge conflict in lib/storage/metadata/mongoclient/MongoClientInterface.js
CONFLICT (add/add): Merge conflict in lib/models/ObjectMD.js
CONFLICT (add/add): Merge conflict in lib/models/BucketInfo.js

@bennettbuchanan bennettbuchanan force-pushed the feature/ZENKO-315/CRRWithoutVersioning branch from 0b87b92 to 2a8169e Compare June 22, 2018 21:02
@ironman-machine ironman-machine dismissed jonathan-gramain’s stale review June 22, 2018 21:02

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan bennettbuchanan mentioned this pull request Jun 22, 2018
Merged
@bert-e
Copy link
Contributor

bert-e commented Jun 23, 2018

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/8.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 Release Engineering 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 Release Engineering now.

@bert-e
Copy link
Contributor

bert-e commented Jun 23, 2018

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

  • ✔️ development/8.0

Please check the status of the associated issue ZENKO-315.

Goodbye bennettbuchanan.

@bert-e bert-e merged commit 2a8169e into development/8.0 Jun 23, 2018
@rahulreddy rahulreddy deleted the feature/ZENKO-315/CRRWithoutVersioning branch June 25, 2018 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ploki ploki ploki left review comments

@philipyoo philipyoo philipyoo approved these changes

@jonathan-gramain jonathan-gramain jonathan-gramain 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
@bennettbuchanan @bert-e @ironman-machine @ploki @jonathan-gramain @philipyoo