Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Conflicts:
iocore/net/UnixNetVConnection.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/179bb986
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/179bb986
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/179bb986
Branch: refs/heads/master
Commit: 179bb9865289f74f79deed35786fefaedb0bb2d1
Parents: 534d52f b2adc70
Author: shinrich <[email protected]>
Authored: Thu Jan 22 08:02:42 2015 -0600
Committer: shinrich <[email protected]>
Committed: Thu Jan 22 08:02:42 2015 -0600
----------------------------------------------------------------------
iocore/net/UnixNet.cc | 2 +-
iocore/net/UnixNetVConnection.cc | 3 +--
mgmt/RecordsConfig.cc | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
