Skip to content

Merge release-1.1 to master #840

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
Merged
merged 24 commits into from
Mar 9, 2019
Merged

Merge release-1.1 to master #840

merged 24 commits into from
Mar 9, 2019

Conversation

ozevren
Copy link
Contributor

@ozevren ozevren commented Mar 8, 2019

No description provided.

mtail and others added 22 commits February 21, 2019 10:24
Doc fixes.
b44daed
@ayj @geeknoid
Add high-level overview and diagrams for MCP (#805)
29a3b64 
* document MCP

* add additional note on NACK behavior

* add a note about ignoring stale nonces
@joeyb @rshriram
Add envoy metrics service configuration to ProxyConfig (#803)
16cc4d7 
* Add envoy metrics service configuration to ProxyConfig

Similar to the statsd sink config, this change is in preparation for adding support for the envoy metrics service API.

* Update proto.lock

* Reorder metrics_service_address just after statsd_udp_address
@diemtvu @geeknoid
Update comment in the authN API to match with 1.1 behavior (#808)
124217d
@joeyb @rshriram
Rename metrics_service_address to clarify that it is for Envoy's API (#…
2f783de 
…809)

Since "metrics service" is so ambiguous, this change specifically denotes that the config is for Envoy's metrics service API. The comments also now link to detailed info about the metrics service API.
@rshriram
Generate separate HTML page per proto under networking (#811)
5f14ead 
* Generate separate pages for each networking proto

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* update

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* tweaks

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* Fix interdoc references

* separate doc and go gen

* change dash to underscore

* fix

* more fixes

* makefile fix

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* remove bad target

* Revert "change dash to underscore"

This reverts commit 7fbced6.

* final update

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
Revert "Generate separate HTML page per proto under networking (#811)"
11e69f5 
This reverts commit 5f14ead since it breaks the ability
to generate reference docs in istio.io
Update to latest tools.
231fadc
Revert "Update to latest tools."
70ec2ed 
This reverts commit 231fadc which I accidentally pushed to the
wrong place.
@ayj @geeknoid
fix mcp update error diagram (#810)
120a390
@rshriram @geeknoid
update istio/tools (#815)
eac219d
@rshriram @geeknoid
Revert "Revert "Generate separate HTML page per proto under networking (
18f2d9a 
#811)"" (#818)
@geeknoid
Minor updates for building docker images. (#817)
d0dc02a
@geeknoid
Add spell checking for docs. (#819)
26f958d
Add a bunch of words to the custom dictionary.
5f85ce0
@frankbu @rshriram
Document exportTo restrictions (#820)
79b2e74
@geeknoid
Doc fixes. (#821)
f2e09a7
@drichelson @rshriram
Proxy config: Add tls_certs_to_watch field (#824)
e613e35 
* Proxy config: Add tls_certs_to_watch field

* Address PR comment
@rshriram
Revert "Proxy config: Add tls_certs_to_watch field (#824)" (#825)
4fd261a 
This reverts commit e613e35.
@frankbu @rshriram
Update gateway and sidecar hosts doc (#826)
ba50f67 
* Update gateway and sidecar hosts doc

* regen

* review comments
@rshriram
Update API docs (service entry, gateway, sidecar) (#831)
c1daca8 
* Update sidecar and gateway docs

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* gen docs

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* update service entry

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* updates

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
@GregHanson @rshriram
add configurable dns refresh rate to mesh for strict dns cluster, (#832)
e1557ac 
* add configurable dns refresh rate to mesh for strict dns cluster, issue #12181

* add lock file
@istio-testing istio-testing requested review from frankbu and utka March 8, 2019 21:45
@ozevren ozevren requested review from diemtvu and geeknoid and removed request for frankbu and utka March 8, 2019 21:45
@googlebot
Copy link
Collaborator

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added the cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. label Mar 8, 2019
@ozevren ozevren requested review from ayj and rshriram March 8, 2019 22:00
@ozevren
Copy link
Contributor Author

ozevren commented Mar 8, 2019

Folks in the reviewer line, could you please take a gander and see if this looks ok to you? I had to resolve a few conflicts.

Specifically, there are changes around scripts/Makefile and authentication policy protos.

@geeknoid
Copy link
Contributor

geeknoid commented Mar 9, 2019

/approve
/lgtm

@istio-testing
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: geeknoid, ozevren

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@geeknoid geeknoid merged commit 5a79ba0 into istio:master Mar 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@geeknoid geeknoid Awaiting requested review from geeknoid

@diemtvu diemtvu Awaiting requested review from diemtvu

@rshriram rshriram Awaiting requested review from rshriram

@ayj ayj Awaiting requested review from ayj

Assignees

@geeknoid geeknoid

Labels

cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.