Skip to content

Conversation

@masaori335
Copy link
Contributor

Backport #654

(cherry picked from commit 59fb3d3)

Conflicts:
	ci/jenkins/bin/docs.sh
@masaori335 masaori335 added Documentation Backport Marked for backport for an LTS patch release labels Nov 4, 2016
@masaori335 masaori335 added this to the 6.2.1 milestone Nov 4, 2016
@masaori335
Copy link
Contributor Author

@PSUdaemon Should I rebase and squash those commits to one commit?

@PSUdaemon
Copy link
Contributor

Up to you, but make sure you don't lose any info from all the commit messages. I'm fine leaving it as three though. Simpler that way too.

@masaori335
Copy link
Contributor Author

OK, let's leave it.

@atsci
Copy link

atsci commented Nov 4, 2016

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

@atsci
Copy link

atsci commented Nov 4, 2016

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

@PSUdaemon PSUdaemon merged commit 73a09e2 into apache:6.2.x Nov 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport Marked for backport for an LTS patch release Documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants