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

Add option to apply enterprise license at zero's startup. #5170

Merged
merged 6 commits into from
Apr 14, 2020

Conversation

martinmr
Copy link
Contributor

@martinmr martinmr commented Apr 10, 2020

GitHub Issue or Jira number.

https://dgraph.atlassian.net/browse/DGRAPH-1218

Affected releases.

20.03.1

Changelog tags.

Added

Please indicate if this is a breaking change.

No

Please indicate if this is an enterprise feature.

Yes

Please indicate if documentation needs to be updated.

Yes. The changes needed are already included in this PR.

Please indicate if end to end testing is needed.

No


This change is Reviewable

Docs Preview: Dgraph Preview

@martinmr martinmr requested review from manishrjain and a team as code owners April 10, 2020 19:43
@martinmr martinmr requested a review from danielmai April 10, 2020 19:43
Copy link
Contributor

@danielmai danielmai left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, 1 of 1 files at r4.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @manishrjain, @martinmr, and @MichaelJCompton)


dgraph/cmd/zero/license.go, line 41 at r4 (raw file):

}

func (st *state) applyLicenceFile(path string) error {

applyLicenseFile (spelling)

Copy link
Contributor Author

@martinmr martinmr left a comment

Choose a reason for hiding this comment

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

Reviewable status: 2 of 4 files reviewed, 3 unresolved discussions (waiting on @danielmai, @golangcibot, @manishrjain, and @MichaelJCompton)


dgraph/cmd/zero/license.go, line 41 at r4 (raw file):

Previously, danielmai (Daniel Mai) wrote…

applyLicenseFile (spelling)

Done.


dgraph/cmd/zero/license_ee.go, line 138 at r1 (raw file):

Previously, golangcibot (Bot from GolangCI) wrote…

File is not gofmt-ed with -s (from gofmt)

	content, err := ioutil.ReadFile(path)
	if err != nil {

Done.


dgraph/cmd/zero/license_ee.go, line 138 at r2 (raw file):

Previously, golangcibot (Bot from GolangCI) wrote…

File is not gofmt-ed with -s (from gofmt)

	content, err := ioutil.ReadFile(path)
	if err != nil {

Done.

@martinmr martinmr requested a review from danielmai April 14, 2020 17:44
Copy link
Contributor

@danielmai danielmai left a comment

Choose a reason for hiding this comment

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

:lgtm:

Please cherry-pick to release/v20.03 too.

Reviewed 2 of 2 files at r5.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @danielmai, @golangcibot, @manishrjain, and @MichaelJCompton)

@martinmr martinmr merged commit 3404199 into master Apr 14, 2020
@martinmr martinmr deleted the martinmr/zero-license branch April 14, 2020 18:34
@martinmr
Copy link
Contributor Author

Cherry-picked it into the release branch.

dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants