[ovs-git] Open vSwitch: Merge "master" into "wdp". (wdp)

dev at openvswitch.org dev at openvswitch.org
Mon Aug 9 17:50:49 UTC 2010


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, wdp has been updated
       via  78661a5ed344f6f4c3d45d64662a74947b31435d (commit)
       via  7d674866d2c95d9027fc2e64d1acc2044e2c004a (commit)
       via  67f6bdd73b612eae4f193164ccf3c144214e9f16 (commit)
       via  5899143f2d10b3fb1a9e9d3b351ddd1b781117db (commit)
       via  0225f3a0f2b18c95ea76362f4a5f816682557a52 (commit)
       via  99e5e05db37ab8271c2264b885813b9a27d6f483 (commit)
       via  ccc9fc5a70e2af642721fa9356d7fbcb9a697d06 (commit)
       via  7cdc630f61b34dc4d54eb9fc0379dd18d0930a79 (commit)
       via  26d79bf2686b08a49c881d5bb54501d7584f5111 (commit)
       via  d12f7113b047455d410cb54862f339717d4c932f (commit)
       via  c393047875e2c9dc76b2f19092fff6bbf69ec4f9 (commit)
       via  d54ff9987c3bbd9989ee7fef574bdab3207aca60 (commit)
       via  6f1e91b1d7c058d701145080c344bbc531b394ed (commit)
       via  55574bb0d21541c13fe67545a74448b36063e461 (commit)
       via  9d2094938de6e6d6503a3d0777f64cff945321c3 (commit)
       via  abfec865566e6cce961cc8660de1ddfdc85dae5f (commit)
       via  8084a2800f82c6d0ec438cb8f2de24518af2c712 (commit)
       via  05d09469058bd78c12bfc60af6093bcbce1901da (commit)
       via  13008eb3dd6b52905156389032e9251fd692c7c0 (commit)
       via  0e869da1a3ea0aa790982be87953c263b6cb59a1 (commit)
       via  210374eb3d590221725f0aa32661581658014ad8 (commit)
       via  d43e8ef3f41160a8c45f96216faffb4afd957948 (commit)
       via  55cc89d6b427ca99dbc1217653033e6308318409 (commit)
       via  a644bae6eec521119252221d4aa989168eccc22b (commit)
       via  3aa77165af7d5acb18e79016ad8d741e35e1d45f (commit)
       via  abdfe47476cc1a192e329f428b3740a3fae8390d (commit)
       via  31681a5d627cec70864764586829bdb92abf2f30 (commit)
       via  1a048029a0902439c3f17c49a7f71e4d09fecf70 (commit)
       via  3a929702ae4153c97ea1b0bbb6af96b5a59573d0 (commit)
       via  52af5b998fbb1b0914e995fe6f21378e394914eb (commit)
       via  5682f723319241223baa7250ed215e1359dd6d8c (commit)
       via  63db6ec35ddc2432dda059f277257886c2d1ba8f (commit)
       via  cc98976af50fec5643a372aa9c7a4c4e565e939e (commit)
       via  b4a7d61582ef3a09a666106a926c8912201dfe72 (commit)
       via  67c74f7515867fb8b3a4d23af98dacd3d547ebdd (commit)
       via  882c2399908b0f33f73651ccfc3aaf76a7858ce4 (commit)
       via  aaaa7553a9b7fef47436e96fb0177981b09e4a83 (commit)
       via  f22716dcca299b863dd72eb193fb1283c5f686da (commit)
       via  fbb29a542d917040bd4d23900e8ef9bf5b1f6ea1 (commit)
       via  6bfafa55fbd78fba244bb9e62081781187a45932 (commit)
      from  95ee79a8c9352237b900bf829e7cf722f3f0ec2b (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 78661a5ed344f6f4c3d45d64662a74947b31435d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=78661a5ed344f6f4c3d45d64662a74947b31435d
Author: Ben Pfaff <blp at nicira.com>
		
Merge "master" into "wdp".
		


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

Summary of changes:
 INSTALL.KVM                                        |    2 +-
 INSTALL.Linux                                      |   13 +-
 configure.ac                                       |    1 +
 datapath/actions.c                                 |    3 +-
 datapath/datapath.c                                |  141 +++++--
 datapath/dp_notify.c                               |    7 +-
 datapath/dp_sysfs_dp.c                             |  238 +++-------
 datapath/dp_sysfs_if.c                             |   82 +----
 datapath/flow.c                                    |   23 +-
 datapath/flow.h                                    |   12 +-
 datapath/linux-2.6/.gitignore                      |    1 +
 datapath/linux-2.6/Modules.mk                      |    3 +-
 .../linux-2.6/compat-2.6/include/linux/skbuff.h    |   13 -
 datapath/linux-2.6/compat-2.6/time.c               |   39 ++
 datapath/vport-internal_dev.c                      |   47 +-
 datapath/vport-netdev.c                            |   10 +-
 datapath/vport.c                                   |   36 +--
 include/openvswitch/xflow.h                        |    2 +-
 lib/automake.mk                                    |    5 +
 lib/flow.c                                         |    2 -
 lib/json.h                                         |    8 +
 lib/learning-switch.c                              |   93 +++-
 lib/learning-switch.h                              |    5 +-
 lib/ofp-parse.c                                    |  503 ++++++++++++++++++++
 tests/test-command-line.h => lib/ofp-parse.h       |   27 +-
 lib/stream-ssl.c                                   |   69 +++-
 lib/stream-ssl.h                                   |    8 +-
 lib/tag.c                                          |   31 ++-
 lib/vlog-modules.def                               |    1 +
 lib/xfif-netdev.c                                  |   15 +-
 ofproto/netflow.c                                  |    6 +-
 ofproto/netflow.h                                  |    4 +-
 ofproto/ofproto.c                                  |  311 +++++++++----
 ofproto/ofproto.h                                  |   12 +-
 ofproto/status.c                                   |    9 -
 ofproto/wdp-xflow.c                                |    7 +-
 ovsdb/ovsdb-server.c                               |    4 +-
 tests/ovs-vsctl.at                                 |   58 +---
 utilities/ovs-controller.8.in                      |    7 +
 utilities/ovs-controller.c                         |   25 +-
 utilities/ovs-ofctl.8.in                           |    5 +
 utilities/ovs-ofctl.c                              |  501 +------------------
 utilities/ovs-openflowd.8.in                       |   13 +-
 utilities/ovs-openflowd.c                          |   50 +-
 utilities/ovs-pki.in                               |   41 ++-
 utilities/ovs-vsctl.8.in                           |   27 +-
 utilities/ovs-vsctl.c                              |  218 ++-------
 vswitchd/bridge.c                                  |  324 +++++++------
 vswitchd/vswitch.ovsschema                         |   48 ++-
 vswitchd/vswitch.xml                               |  305 +++++++++---
 xenserver/etc_init.d_openvswitch                   |    6 +-
 51 files changed, 1858 insertions(+), 1563 deletions(-)
 create mode 100644 datapath/linux-2.6/compat-2.6/time.c
 create mode 100644 lib/ofp-parse.c
 copy tests/test-command-line.h => lib/ofp-parse.h (55%)


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list