Skip to content

Merge release-1.1 into master#721

Merged
hklai merged 13 commits intoistio:masterfrom
hklai:1.1-master
Dec 1, 2018
Merged

Merge release-1.1 into master#721
hklai merged 13 commits intoistio:masterfrom
hklai:1.1-master

Conversation

@hklai
Copy link
Copy Markdown
Contributor

@hklai hklai commented Dec 1, 2018

No description provided.

rshriram and others added 13 commits November 12, 2018 12:20
@rshriram
Adding weights to service entry endpoints (istio#704)
56c8213 
* add dynamic state to attribute list

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

* Adding weights to service entry endpoints

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

* undo
Merge remote-tracking branch 'origin/master' into release-1.1
afb4e08
update protolock
1aa3b31 
Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
@rshriram
Merge pull request istio#705 from rshriram/release-1.1
05124e6 
Merge missing commits from master to release-1.1
@GregHanson @istio-testing
fix naming convention between access log format vs encoding (istio#711)
60483a5
@GregHanson @istio-testing
Revert "fix naming convention between access log format vs encoding (i…
44363fb 
…stio#711)" (istio#712)

This reverts commit 60483a5.
@GregHanson @istio-testing
add access log encoding (istio#713)
a48276b
@itaysk @rshriram
clarify http match example (istio#714)
e612616
@shakti-das @istio-testing
API changes to enable TCP keepalive configuration. (istio#718)
fd49366 
* API changes to enable TCP keepalive configuration.

Signed-off-by: Shakti <shaktiprakash.das@salesforce.com>

* Added probes configuration to tcp_keepalive.

Signed-off-by: Shakti <shaktiprakash.das@salesforce.com>

* Updated description to 'time duration'.

Signed-off-by: Shakti <shaktiprakash.das@salesforce.com>
@itaysk @istio-testing
allow setting headers (istio#709)
1a7788d 
* refactor headers

* proto-commit

* settle num entries with 1.1 state
@rshriram
NetworkScopes (istio#719)
4f643c9 
* default network scope

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

* protolock

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

* doc update

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

* NetworkScopes

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

* proto lock

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

* updates

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

* default network scope

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

* doc updates

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

* updates

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

* rename

* nits and final updates

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
@rshriram
rename NetworkScope to ServiceDependency (istio#720)
49946a7 
* rename NetworkScope to ServiceDependency

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

* update

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
@hklai
Merge remote-tracking branch 'upstream/release-1.1' into 1.1-master
a6e0c12
@googlebot
Copy link
Copy Markdown
Collaborator

googlebot commented Dec 1, 2018

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.

@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 Dec 1, 2018
@hklai hklai added cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Dec 1, 2018
@googlebot
Copy link
Copy Markdown
Collaborator

googlebot commented Dec 1, 2018

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

@hklai hklai requested review from ayj and kyessenov December 1, 2018 00:56
@kyessenov
Copy link
Copy Markdown
Contributor

kyessenov commented Dec 1, 2018

/lgtm

If it doesn't work, just add a label :P

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Dec 1, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hklai, kyessenov

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

The pull request process is described here

Details 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

@hklai hklai merged commit a4f4a1f into istio:master Dec 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@costinm costinm Awaiting requested review from costinm

@mandarjog mandarjog Awaiting requested review from mandarjog

@kyessenov kyessenov Awaiting requested review from kyessenov

@ayj ayj Awaiting requested review from ayj

Assignees

@kyessenov kyessenov

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@hklai @googlebot @kyessenov @istio-testing @rshriram @GregHanson @itaysk @shakti-das