Skip to content

Conversation

larrywest
Copy link
Contributor

Description:

The PR (#6384) for the enhancement to jwt_authn was accepted before 1.10.0 was cut, and so the history was edited with 1.10.0 in mind, but the merge happened just after 1.10.0 was cut.

Therefore, this change moves the jwt_authn line from the "1.10.0 (April 5, 2019)" section in "version_history.rst" to the "1.11.0 (Pending)" section.

Risk Level: None - documentation only
Testing: Not applicable
Docs Changes: version_history.rst is the only file changed
Release Notes: (that's what is changed.)

Relates to issue #6355 and PR #6384

@larrywest
Copy link
Contributor Author

(FWIW, I suggest @lizan as reviewer, since he reviewed the original PR, #6384)

@lizan
Copy link
Member

lizan commented Apr 23, 2019

@larrywest can you fix the DCO? See https://github.com/envoyproxy/envoy/blob/master/CONTRIBUTING.md#fixing-dco . Fell free to squash the commits.

@larrywest
Copy link
Contributor Author

ohhh... right... I think this might be because I did the commit directly on github rather than on my laptop.

I'll follow those instructions.

The PR (envoyproxy#6384) for the enhancement to jwt_authn was accepted before 1.10.0 was cut, and so the history was edited with 1.10.0 in mind, but the merge of  happened just after 1.10.0 was cut.

Therefore, this change moves the jwt_authn line from the "1.10.0 (April 5, 2019)" section to the "1.11.0 (Pending)" section.
Signed-off-by: Larry West <Larry_West@intuit.com>
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thanks

@mattklein123 mattklein123 merged commit 2c31247 into envoyproxy:master Apr 23, 2019
mpuncel added a commit to mpuncel/envoy that referenced this pull request Apr 24, 2019
* master:
  docs: add extension policy (envoyproxy#6678)
  ext_authz: added ability to detect partial request body data (envoyproxy#6583)
  version_history.rst: jwt_authn change missed 1.10.0 (envoyproxy#6684)
  docs: fix link in pull request template (envoyproxy#6679)
  Explicitly convert absl::string_view to std::string. (envoyproxy#6687)
  docs: improving watermark docs/comments (envoyproxy#6683)
  http filter: add CSRF filter (envoyproxy#6470)
  event: reintroduce dispatcher stats (envoyproxy#6659)
  security: postmortem for CVE-2019-990[01] (envoyproxy#6597)
  Improve build rules for (test only) library quic_port_utils. (envoyproxy#6672)
  spell check: skip unsupported extensions when called with a file (envoyproxy#6648)
  Changed TestHooks to ListenerHooks (envoyproxy#6642)
  proto: move extension-specific linking validation into extensions (envoyproxy#6657)
  stats: add/test heterogenous set of StatNameStorage objects. (envoyproxy#6504)
  docs: move xds protocol to rst (envoyproxy#6670)
  fix version history order (envoyproxy#6671)

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
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.

3 participants