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

Remove duplicate sentence from readme #475

Merged
merged 1 commit into from
Jun 11, 2019
Merged

Conversation

michael-k
Copy link
Contributor

No description provided.

@autrilla
Copy link
Contributor

Can you make this merge against the develop branch?

@michael-k michael-k changed the base branch from master to develop June 11, 2019 10:56
@michael-k
Copy link
Contributor Author

Can you make this merge against the develop branch?

Of course, but it would be nice if this was mentioned in https://github.com/mozilla/sops/blob/master/CONTRIBUTING.md

@autrilla
Copy link
Contributor

Can you make this merge against the develop branch?

Of course, but it would be nice if this was mentioned in https://github.com/mozilla/sops/blob/master/CONTRIBUTING.md

cc @ajvb is there any reason we don't?

@codecov-io
Copy link

Codecov Report

Merging #475 into develop will increase coverage by 0.18%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #475      +/-   ##
===========================================
+ Coverage     36.2%   36.38%   +0.18%     
===========================================
  Files           20       20              
  Lines         2718     2718              
===========================================
+ Hits           984      989       +5     
+ Misses        1644     1640       -4     
+ Partials        90       89       -1
Impacted Files Coverage Δ
stores/flatten.go 91.52% <0%> (+4.23%) ⬆️

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 15dfcfa...cfbbe3f. Read the comment docs.

@autrilla autrilla merged commit 6b68dcb into getsops:develop Jun 11, 2019
@autrilla
Copy link
Contributor

Thanks!

@michael-k
Copy link
Contributor Author

I guess the change just hasn't made it to master yet. It's mentioned in the develop branch: https://github.com/mozilla/sops/blob/develop/CONTRIBUTING.md

@michael-k michael-k deleted the patch-1 branch June 11, 2019 11:07
@ajvb
Copy link
Contributor

ajvb commented Jun 11, 2019

@autrilla yeah, exactly what @michael-k said. Will create a PR to cut a new release for 3.3.1.

ajvb added a commit that referenced this pull request Jun 11, 2019
* 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)
ajvb added a commit that referenced this pull request Sep 11, 2019
* 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)
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