[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/704c50fe Tree: http://git-wip-us.apache.org/repos/asf/t

git commit: Changing ssl debug message for npn advertisement

Repository: trafficserver Updated Branches: refs/heads/master 9f2f83726 -> b697c8f32 Changing ssl debug message for npn advertisement Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b697c8f3 Tree: http://gi

git commit: Updated changes to include TS-2636

Repository: trafficserver Updated Branches: refs/heads/master 92bdda991 -> 7f6f2709b Updated changes to include TS-2636 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7f6f2709 Tree: http://git-wip-us.apach

git commit: Typos and indentation.

Repository: trafficserver Updated Branches: refs/heads/master 41a746080 -> 2b6a7a6b9 Typos and indentation. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2b6a7a6b Tree: http://git-wip-us.apache.org/repos/

git commit: Eliminate superfluous initialization

Repository: trafficserver Updated Branches: refs/heads/master 999ec640a -> 26993fe01 Eliminate superfluous initialization Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/26993fe0 Tree: http://git-wip-us.apa

git commit: TS-2624: Fix Build on older platforms

Repository: trafficserver Updated Branches: refs/heads/master 91c80ec58 -> 999ec640a TS-2624: Fix Build on older platforms Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/999ec640 Tree: http://git-wip-us.ap

git commit: Another indentation.

Repository: trafficserver Updated Branches: refs/heads/master 2b6a7a6b9 -> 4bb18a966 Another indentation. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4bb18a96 Tree: http://git-wip-us.apache.org/repos/as

git commit: TS-2624: Divide by zero check.

Repository: trafficserver Updated Branches: refs/heads/master 26993fe01 -> bb64b54b7 TS-2624: Divide by zero check. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb64b54b Tree: http://git-wip-us.apache.or