[ovs-git] Open vSwitch: Merge pull request #1 from spil-jasper/master (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  d73728e6bc30c8e6b393699ef78eb7919b1c68c5 (commit)
       via  9b2cb97179426f083b1d22b505b61607de5e0c36 (commit)
       via  9620f50ccce53b75c45949f3984029fa67241afe (commit)
       via  92c08f09804c4a32ecc5f24473f3e15cbbdb1d5e (commit)
       via  4465062f14d74dae8e030b9b6fd2d073cfdead65 (commit)
      from  6362203b08e8ee61d52cacdaf5550aefa42e4c84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d73728e6bc30c8e6b393699ef78eb7919b1c68c5
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=d73728e6bc30c8e6b393699ef78eb7919b1c68c5
Author: Ben Pfaff <blp at nicira.com>
		
Merge pull request #1 from spil-jasper/master
		
Add BuildRequires to RHEL specfile

commit 9b2cb97179426f083b1d22b505b61607de5e0c36
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9b2cb97179426f083b1d22b505b61607de5e0c36
Author: Simon Horman <horms at verge.net.au>
		
ofproto-dpif: Correct check_recirc comment
		
This is a proposed correction for what appears to be
an editing error.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 9620f50ccce53b75c45949f3984029fa67241afe
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9620f50ccce53b75c45949f3984029fa67241afe
Author: Alexandru Copot <alex.mihai.c at gmail.com>
		
ofp-print: Enable printing OF1.4 version
		
Also fix some tests that can now properly print packets
with the new protocol version.

Signed-off-by: Alexandru Copot <alex.mihai.c at gmail.com>
Cc: Daniel Baluta <dbaluta at ixiacom.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 92c08f09804c4a32ecc5f24473f3e15cbbdb1d5e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=92c08f09804c4a32ecc5f24473f3e15cbbdb1d5e
Author: Simon Horman <horms at verge.net.au>
		
ofproto-dpif: Move recirc members from struct xlate_out to struct xlate_ctx
		
There does not seem to be a reason to expose
recirc members in struct xlate_out to move them
to struct xlate_ctx.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 4465062f14d74dae8e030b9b6fd2d073cfdead65
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4465062f14d74dae8e030b9b6fd2d073cfdead65
Author: Jasper Capel <Jasper.Capel at spilgames.com>
		
Add BuildRequires to RHEL specfile
		
Added a build-time dependency on openssl-devel, so you can easily build
a source RPM and then pass it into mock for building in a clean build
environment (without manually having to install the buildrequires).

Signed-off-by: Jasper Capel <jasper at capel.tv>


-----------------------------------------------------------------------

Summary of changes:
 AUTHORS                      |    1 +
 lib/ofp-print.c              |    3 +++
 ofproto/ofproto-dpif-xlate.c |   20 ++++++++++++--------
 ofproto/ofproto-dpif-xlate.h |    3 ---
 ofproto/ofproto-dpif.c       |    6 +++---
 rhel/openvswitch.spec.in     |    1 +
 tests/ofp-print.at           |    6 +++---
 tests/ofp-util.at            |    2 +-
 8 files changed, 24 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Open vSwitch