You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/31 03:14:50 UTC

[31/51] 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


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f41323e0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f41323e0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f41323e0

Branch: refs/heads/3.3.x
Commit: f41323e010480a7e206c680b3fc3b06ac8a4675a
Parents: 5a34bbd 1a2ebcc
Author: John Plevyak <jp...@apache.org>
Authored: Thu Mar 21 13:53:59 2013 -0700
Committer: John Plevyak <jp...@acm.org>
Committed: Thu Mar 21 13:53:59 2013 -0700

----------------------------------------------------------------------
 CHANGES                                   |    3 +
 iocore/eventsystem/P_UnixEventProcessor.h |    4 +-
 mgmt/Main.cc                              |   18 --
 mgmt/cluster/ClusterCom.cc                |   12 +-
 mgmt/cluster/VMap.cc                      |  341 ++----------------------
 mgmt/cluster/VMap.h                       |   13 +-
 proxy/config/vaddrs.config.default        |   11 +-
 7 files changed, 46 insertions(+), 356 deletions(-)
----------------------------------------------------------------------