Skip to content

TS-4678 Promotes a few plugins to stable - #821

Merged
zwoop merged 2 commits into
apache:masterfrom
zwoop:TS-4678
Jul 26, 2016
Merged

TS-4678 Promotes a few plugins to stable#821
zwoop merged 2 commits into
apache:masterfrom
zwoop:TS-4678

Conversation

@zwoop

@zwoop zwoop commented Jul 22, 2016

Copy link
Copy Markdown
Contributor

The following are moved:

authproxy
background_fetch
esi
generator
regex_revalidate
s3_auth
xdebug

The following are moved:

  authproxy
  background_fetch
  esi
  generator
  regex_revalidate
  s3_auth
  xdebug
@zwoop zwoop added this to the 7.0.0 milestone Jul 22, 2016
@zwoop

zwoop commented Jul 22, 2016

Copy link
Copy Markdown
Contributor Author

@mlibbey Please review.

@atsci

atsci commented Jul 22, 2016

Copy link
Copy Markdown

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/472/ for details.

@atsci

atsci commented Jul 22, 2016

Copy link
Copy Markdown

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/369/ for details.

@mlibbey

mlibbey commented Jul 22, 2016

Copy link
Copy Markdown
Contributor

Think we need trafficserver/doc/admin-guide/plugins/index.en.rst changes too?

@zwoop

zwoop commented Jul 22, 2016

Copy link
Copy Markdown
Contributor Author

@mlibbey Yes. Updated, see second commit. (I will squash the commits before committing)

@atsci

atsci commented Jul 22, 2016

Copy link
Copy Markdown

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/473/ for details.

@atsci

atsci commented Jul 22, 2016

Copy link
Copy Markdown

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/370/ for details.

@zwoop
zwoop merged commit e5db4d9 into apache:master Jul 26, 2016
@zwoop
zwoop deleted the TS-4678 branch July 26, 2016 14:43
JosiahWI pushed a commit to JosiahWI/trafficserver that referenced this pull request Jul 19, 2023
Merge ASF 9.2.x into Edge 9.1.x

The conflicts all have to do with
apache#9647 which we are
intentionally not merging in.

    Conflicts:
          doc/developer-guide/api/functions/TSSslSecret.en.rst
          include/ts/apidefs.h.in
          include/ts/ts.h
          iocore/net/SSLSecret.cc
          iocore/net/SSLUtils.cc
          proxy/InkAPIInternal.h
          src/traffic_server/InkAPI.cc
          tests/gold_tests/tls/tls_check_cert_select_plugin.test.py
          tests/gold_tests/tls/tls_client_cert2_plugin.test.py
          tests/gold_tests/tls/tls_client_cert_override_plugin.test.py
          tests/gold_tests/tls/tls_client_cert_plugin.test.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants