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 Mozilla Public License Version 2.0 #487

Closed
wants to merge 3 commits into from
Closed

add Mozilla Public License Version 2.0 #487

wants to merge 3 commits into from

Conversation

adrianosela
Copy link
Contributor

@autrilla autrilla self-requested a review July 2, 2019 19:46
@autrilla
Copy link
Contributor

autrilla commented Jul 2, 2019

Thanks for the patch! We need to get it into the develop branch first though. Can you change the PR to merge to develop?

@adrianosela adrianosela changed the base branch from master to develop July 2, 2019 20:33
@codecov-io
Copy link

codecov-io commented Jul 3, 2019

Codecov Report

Merging #487 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #487   +/-   ##
========================================
  Coverage    36.44%   36.44%           
========================================
  Files           20       20           
  Lines         2760     2760           
========================================
  Hits          1006     1006           
  Misses        1662     1662           
  Partials        92       92

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ebd153f...02f488b. Read the comment docs.

@autrilla
Copy link
Contributor

autrilla commented Jul 4, 2019

@adrianosela the diff is now very big -- I think something went wrong with the change

knqyf263 and others added 3 commits July 4, 2019 10:28
* Update README.rst

* Update README.rst
* Changes to travis config and docs for using develop (#462)

* Fixes integration tests in travis to not run on PR's (they will now
run on merges into `develop` and `master`)
* Change README.rst and CONTRIBUTING.md to reflect the use of `develop`
as the primary development branch

* use golang 1.12 for building sops

* pgp/keysource: Check size of key fingerprint

Make sure the key fingerprint is longer than 16 characters before
slicing it.

Closes #463

* Allow set "json value" to be a string. (#468)

* Allow set "json value" to be a string.

Adds back support for string values in --set, while retaining support
for yaml multidoc that caused this bug.

Fixes #461

* Add functional test for --set'ing strings

* Vendoring update (#472)

It's been around 9 months since our last vendor update. This is also
needed for some new features being worked on for sops workspace.

Additionally, this PR regenerates the kms mocks.

* Remove duplicate sentence from readme (#475)

* 3.3.1 bump and release notes (#477)
@adrianosela
Copy link
Contributor Author

closing in favor of #488

@adrianosela adrianosela closed this Jul 4, 2019
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.

5 participants