On Fri, 2013-11-08 at 10:01 -0500, Nigel Heron wrote:
> here's v4 of the patch. I added documentation and a new global view
> called "pg_stat_socket" (includes bytes_sent, bytes_received and
> stats_reset time)
Your patch needs to be rebased:
CONFLICT (content): Merge conflict in src/test/regress/expected/rules.out