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

dev at openvswitch.org dev at openvswitch.org
Thu May 20 20:37:46 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  e20567b044dd19cd0a70b5e0cfdf2bf925739f45 (commit)
       via  ca247927bd5445e77391ffb98f713b2cd258c017 (commit)
       via  100e95db240fdea0e2b650e9fc1b59a962ae3847 (commit)
       via  6fce4487240b12104f3984e0bc36f9183e2fcccb (commit)
       via  85444c3f79f594c838d4b3e72ff27e263514f194 (commit)
       via  4aa13c0c348cf78d28095196139489392eae1c67 (commit)
       via  7c284ac400d8e6aefb96c00992114eae6aeba557 (commit)
       via  7183d1ecce62da62b31ea973c01fd77721f42c2c (commit)
       via  9dca7bd50a93eeb26fb7e47ddb896de22f782e7b (commit)
       via  8819fac72b9888bec99aae656bcdb1631b99d01b (commit)
       via  1c075d0aff8267b05073971211e79d73392078cf (commit)
       via  1d7241c7298615ca4e2b45647bf231e22f80e667 (commit)
       via  3d47699cdf86ee68120f97814349099457b48242 (commit)
       via  3fbd517acfd8dba2cd75fa234b0eb3337d202d33 (commit)
       via  776f10ce0f008e95b457f8c6b69b9748d8d1fdbd (commit)
       via  44e05ecafe7c164a328a0108b8685f21569d2a37 (commit)
       via  1da3c6a0500a6dae270c918d5c85c60682ba6036 (commit)
       via  6d7568dc38fb832b7e152c184b0bdfdca6bb9527 (commit)
       via  436f27dd880bd4e1e1d06ca2744c875b01b9e1c1 (commit)
       via  a9633ada756ec15e1ed3dd9b503af3027dee3d10 (commit)
       via  7c2dd4c64823397d82d7d1c4e44f6a420df52aa6 (commit)
       via  e2bfacb6e490bb571f2fbd243c7a2d4658149fba (commit)
       via  32d9dc1181e99ca891cb30a44ee709dcf9fb988f (commit)
       via  0caf6bde24f37a616b64075e65ad5eede73398ba (commit)
       via  c91248b3ab3f75070c7985fe723f54437cb8848e (commit)
       via  89b9612d11e6ff92b176d9674983721c8c9fd3b0 (commit)
       via  7f1089b5036d9e51b8a9205d8462101bdaf52b95 (commit)
       via  a6bc4a03a44ee8a4ab346f0c1a6e21d20a1d29bd (commit)
       via  1e3c004749e1e0498dac6240b6edda472718dde2 (commit)
       via  c088c3be069e991e2d8a3acfdcbb9af278c6d5e5 (commit)
       via  f7cf2ff0b63dc76af9358282dcbe81e9433a94ae (commit)
       via  2455c7fac224c9d6dfe8de9a2204e2edeabe001c (commit)
       via  54adbf40ff717f05e081967102083889143447a7 (commit)
       via  2457b24fc5c935ec8c2930f9df923fc37b8bb38e (commit)
       via  d25b341aa8ce7062a0995adfe1a8e4321c10a727 (commit)
       via  176aaa65aac64b929fac8158fc1d2f577347effe (commit)
       via  afa3a93165f1f576d03cbf9fc1a2f8ddc2a64d01 (commit)
       via  a1ae5dc8da2d30704f7654e0d593cf2ca1e088f7 (commit)
       via  e86dd676cdb1885ee4f8f1fa92176d159d5bb533 (commit)
       via  1f4f3cd7e05f032ac3e39b877e1e72077ca985d5 (commit)
       via  62c87d4aed70d5085bbe1fec4d36c3c2d16c6a00 (commit)
       via  26adc8ddd75df99c17bf4bbe8dac5562213866bc (commit)
       via  f4267e344a9373a4efefff8f8f5b85f532d223e1 (commit)
       via  ccc1d98b87177aa6a3041e19b5c2e4ceeb22384a (commit)
       via  090847a35fad779bf42061364d282619e07b8f80 (commit)
       via  7dab724e7d49b3fbaeed67b9d3d22378996a604e (commit)
       via  32ec73557fecb0c18193c54dc31479e4b84e2c0c (commit)
       via  14cf356bf27c3c7e52a1f8fe3d7f0ffcb19af7fb (commit)
       via  30ea5d93dc1258c59e3ebbe090169cd3bf9ef078 (commit)
       via  6f42c8ea9a2980fa7104f2deee9d9d1af9b64bed (commit)
       via  80a86fbed4023de90d7f7b174564e26c27f65b9d (commit)
       via  8e46022197dd9f04a3e73f741482d98972f6b70a (commit)
       via  a5af30fbaa19b78ecd236f0549379a141032119b (commit)
       via  54825e09b3aaf4b9513af7d02011306e01b0768c (commit)
       via  3e9c481c70473b5faa29c72a1e609a31ddb6b990 (commit)
       via  36c501fe7888bce761b5527dbd2ac7234543aef1 (commit)
       via  836fad5e1ae4316752150fcdfba9afbf8d5f5801 (commit)
       via  4a1ee6ae821f73c877af1548d6db9a0e04ad8eaf (commit)
       via  9e15c889f7a94db2decefd93dd6b3f77fb1b7bc6 (commit)
       via  5586445e9945574da85f96976ca650e19b8216c1 (commit)
       via  f9727d74050e1ff1c25ad0308a46e84c4d4870b5 (commit)
       via  c62caaa3f4132eba085c8ba15577b62195642711 (commit)
       via  e723ff43aab4f6d1c9a7198f7d2b226804800a9d (commit)
       via  7b99db051b2560290a6e1bc123f1b4e760226faa (commit)
       via  d01600a208854a6ad1990eaf484dca6e8d6700e5 (commit)
       via  0313fb2e2fcf1df05ea21eeaf47f22c4e0e9796c (commit)
       via  3bcf3e33e9cfb7fd837086bfa8e627110d84dce8 (commit)
       via  d8b5d43a04fba8ba09d5bb3c745808964f371d80 (commit)
       via  59a81d829017956100170f9499dc690613fc1f6f (commit)
       via  18ee958b7bb33174327285562901de71ee4a5232 (commit)
       via  58bc1a52cb0b88f8f44b175f13f602e650bc9d06 (commit)
       via  e1c1de3922cddb59775e819b47c421f90f364214 (commit)
       via  ceb4559f662c12eeb2bf9e4665ec88e96d990752 (commit)
       via  21291d67574ae857d028c40b2fcc1116b6be6dfa (commit)
       via  968f7c8d772e704ff96bd2923d474c7f969c7c6b (commit)
       via  092a872d6e8009ef547dc66274936dc879c55419 (commit)
       via  1224e8fc1da9cddef6bdb24814300893bb2ace89 (commit)
       via  43253595291318833572088595769b45a79c9c54 (commit)
       via  1f256c11cd354fe1494af6846cf31c7ee2698e6c (commit)
       via  b1cd4308bcaad248bcb4713b08911d702cd29007 (commit)
       via  9cad684489e19b10019b5ae045decfb8f1311772 (commit)
       via  e7eacf16f52a69d73afbdfda62d2d181282fbdf4 (commit)
       via  070644563cd7a9b073d30bfe194981bde016e528 (commit)
       via  55e199190427d962831486b5cec0d1723519a197 (commit)
       via  2e8a4c31abe39ce4443d046d86c595fd73351900 (commit)
       via  a4948b95af9cfebb85ffcef9fbccc27b7a218a79 (commit)
       via  30f07f1a5e2a021d8e05167b5db93968a2036033 (commit)
       via  11bbff1b79a97c377021560b8a262af95a0dd1b9 (commit)
       via  d799ae067f9d442bf15f3ee757346d1f865cbc38 (commit)
       via  3b3289fcb969fa3eab708b55d1b7d24d32644d1b (commit)
       via  26efd2563bf76547cf38da49ec83997e091b2517 (commit)
       via  cd11000ba2ce68a6eaeabed7efcb061b39ceaa44 (commit)
       via  52f8a75e1b9cd27d35f45daabe9ca5495b4faee3 (commit)
       via  917e50e1b8c68cb2a0e8ac36f638f2ba3ecb2de9 (commit)
       via  d2ede7bc13478e45c58d31a3fe569785b0622682 (commit)
       via  1c6d11a82e7a48c26a6676ddecfcf29c2e853654 (commit)
       via  66cd496a30819638c198c614c5502cf6fa116500 (commit)
       via  bad0c37193b4697cec1b6d5f1afb3413edbd9c3c (commit)
       via  a3c5ac709a32ad802534b6039fd8f762910d19d6 (commit)
       via  c16e55cf846f7a04a28730e25193d6a8ccd95f11 (commit)
       via  5dbdfff733b4833397feba64047dabac9bb36531 (commit)
       via  6dee2066b5edaa9b5c7af572d075591ad595428d (commit)
       via  375008d8769d35ea58343a0a57bb757f5a77fcad (commit)
       via  b9f9f37fb7a85dbe58a260f6e1b745a17db66dd5 (commit)
       via  ea32310720d9d07eeb668e404a5062bd9bce832d (commit)
       via  291a0f6b6e05fe5be28b935436abb5a958334885 (commit)
       via  79eb8b002c588e6f7495a0cd73d8a0597a458442 (commit)
       via  537eeb9ccfecddd8b234225c79400f8c22b33f63 (commit)
       via  eea2aafb1268678cc3de2bad09941ee25d80a824 (commit)
       via  cc1ad53290f439bb137888fed3cc51826addd24c (commit)
       via  fba0d699ef5b097b42c49539b9ff4c05c62433ed (commit)
       via  87472751f782d7441afb829e7b408c1668f97fb2 (commit)
       via  ff2765f15b18555e93f80aec45ec9fc27eb2a8e0 (commit)
       via  33e01d3a2b539f0ffd6fd02d019fda6a26bfcb0c (commit)
       via  9deba63bdebc2e0eceab8da186b79703fe694186 (commit)
       via  76ce9432393df462e2030036021ea60096a734d4 (commit)
       via  79c9f2ee7883b52860c76c3730725f5731402874 (commit)
       via  0ade584ebe8ca1a1de92fb7422566726f276918c (commit)
       via  f7de2cdffcadaca5f62003f9c115052aa295aa70 (commit)
       via  7103dec49eb569c3196239da6c178a29c3003e2b (commit)
       via  a35801789a04c3c2abfdccb8afe9b21289bf190a (commit)
       via  dc6ddf68b20d802f01cd4a82aca29f442b5c4097 (commit)
       via  25bfb758931fbb1c53ac351caed8756ea516b734 (commit)
       via  ab48643b58bb081cab6408ee2a4aca50cf7ddcc6 (commit)
       via  4a2026dd696e283488c5372bce97eb02005bee6f (commit)
       via  fb0d597fb64308c60001e3afc9b31eb295dedb6b (commit)
       via  fcbaf28cb38d2a848e78d7ba42800eb03fbe6579 (commit)
       via  ede818437a16d1cf50c5e8f285593f85cd6f2513 (commit)
       via  8872051980d541cd7b88c624ac3a08e85171df40 (commit)
       via  b9e09a071d7d01b87c70341a9e9111b0c353c867 (commit)
       via  b3dfb94599743cf8670c7582ce319d8d82848469 (commit)
       via  8722022c0c0d29d3f998dc26c50944c456e56646 (commit)
       via  6f643e4946016399f0b217c2226284e3892b6267 (commit)
       via  3fe8053b36da715c411b907ac125e41f9e9a28f2 (commit)
       via  4c0f178060b740faac9a5aec915a24dc3b61770c (commit)
       via  658797c83a9b656493c8911026f12a5397cbd5ba (commit)
       via  15b3596a4105bbea82108ac251f9b19dc316e19d (commit)
       via  2736b84e2348090d4756f987db37aa7ddfcb50e0 (commit)
       via  ff6402a9f0d9ee4c29567b62938c82924d502b92 (commit)
       via  2d2a0e309f2464fd2cf77a328b15acc62cfc7c09 (commit)
       via  8d5ebd839b86463c72239fe972001e4f1a367a7b (commit)
       via  3abc4a1a6c29ebecffeecedd582c64e0bb7d4c53 (commit)
       via  fdd8224884cbc92dd6e42f617018625f6a6d4c96 (commit)
       via  f2459fe7d91c4c325dfaa3ed18f56200b63ae27e (commit)
       via  6b8a6c529b2bd8ce03584b132263dca5ac932c1b (commit)
       via  b5e80aecc4b10f73196f272598bac0644f196471 (commit)
       via  c5ccff0db1e0ef75e36a414e8c0c2b8421cdeda8 (commit)
       via  659586efcf6f9539282da9447007897907c41112 (commit)
       via  db0e2ad101f10288c002bd537047f3d9e1979c9f (commit)
       via  14a34d00add5b3d39937015f2fb4b2e800fd9f2d (commit)
       via  1609aa03102118be8448fc21c818e159ef52e253 (commit)
       via  f925807dc8ab649834b880bf34e985c2149ff5d2 (commit)
       via  50b2ad57cb4e2478baf7b71f0c31433eb6a37981 (commit)
       via  8aed4223e0933c0602c1e624b07094d7f7afb23d (commit)
       via  4dcf0d73c247c538807dbb642437aaf33589822b (commit)
       via  5b9334be31c1992ddb6e14e8aea6413f00ddb1ab (commit)
       via  5de48440612252484f028d26f23d04ba57ce7ab9 (commit)
       via  2c5d1389238951aa3c8a7382a39dc93033733120 (commit)
       via  2b1a27a1f834fd5f02cd1c376769bf5450805983 (commit)
       via  80bc2072c0f8b105142f7f30f202809127af87a5 (commit)
       via  0b6d72fc776179703ba2cc8d8b3ea878a29cad61 (commit)
       via  cd05c6ad2fdcedce229f962ca29c167287b9b21b (commit)
       via  b843fa1b41a6e9ed362e0414f0b3f6b42bfa3e66 (commit)
       via  379c2564b617aa4d36efba0956d92d0d363c6d86 (commit)
       via  392804e7ee2753cea831503fbdbafc2d7780862a (commit)
       via  999f0d4588503af5a7645ed2f64764bd48c29b9b (commit)
       via  e18fe8a220f268624e5b670d6adcf2d4080866aa (commit)
       via  b302749b70bd8b487bdfe0ffcdacbf730da8b6ca (commit)
       via  9888b1b43ba258e7842100799406f57392c76db7 (commit)
       via  8085488086c48577deaf26fcc11d1be02a6ee140 (commit)
       via  a7de953d1862206f1e5eb928e14e998d6c93926c (commit)
       via  9d73e170da9d7ab21b81d5b0b2d1c0b089d5cc80 (commit)
       via  9b180fbbe1087d032f5cd3c525f028f83d48e8c2 (commit)
       via  0d11f523a371910cb0ed5549a85836f83a7552c2 (commit)
       via  f39dc942afd5fe241903aada30850a1d96122c8c (commit)
       via  766407ea9011d347d577a3409acb0f8d34cc72e1 (commit)
       via  c6278d208924bb04c41266ddca276712f95533bc (commit)
       via  c9f3f37a9d3eeac3740122569ec96c3658b615df (commit)
       via  19df7f512c50e453c8eaa97675e213b4d6e9735d (commit)
       via  024b7728cc40be792f9a27c434720258d8e77ef0 (commit)
       via  ba104a1e39de45a2f33da0a132a17646da1ef931 (commit)
       via  26ad129e69fc7c800630dbd541dc2dcc8150c3a4 (commit)
       via  218a6f5959af42f0fb089bc7d20f418d193832dc (commit)
       via  b66bdf3032561157c66c81e1f9f1e05aec18ede7 (commit)
       via  7b38bdc8e1a960414e5b1622ca5ce4eacf663c03 (commit)
       via  ea205ad502227708ee1f460765a2ade712565d9e (commit)
       via  b84f503d84d0268c17d5887c6526a3aaee56795c (commit)
       via  6a1f89c86b67db7ad1532031a726bd4f517ab162 (commit)
       via  8cce2125eea6e800bfe501916aac313880b751a7 (commit)
       via  1ac981803fad658965714bf82fd6b17f910f4b33 (commit)
       via  6501fda909c3f70fb8df171003af32956d05fc43 (commit)
       via  f0c689263a0424c83663b8466a64a051a012c757 (commit)
       via  cf624c5f09ca1b0724312029bbfb7b281f697ae1 (commit)
       via  aeb2b7a166ec1f7143bd75b01a65ba440cccd88a (commit)
       via  7128cd6b043dea349bedd910a4b695022b72be1b (commit)
       via  1981102e61e7b03c36e214390dfa535ef2dfc460 (commit)
       via  e278140516c5fce346d882dd9ac51558f17cd14c (commit)
       via  b31ac77a39f2d4ed9eb8740b2f1127d22fc3054d (commit)
       via  4e39950c21c5eb401be5924e798c570ffbd0c75b (commit)
       via  22342ac881747f63bb957bc8762a128611bfae2c (commit)
       via  c8143c8879228e6d70345a0ef5cae5f416ff330d (commit)
       via  18b239f5833014524bc89f06bd54a0da518cdf78 (commit)
       via  79eee1eb33caa89ced4a03c2f486d94cd1b6930f (commit)
       via  3a2fe1f354988b92aa8b4fa8a7c3bac04f8693ab (commit)
       via  aecaf0726b490f96675b3dad1c8933f1a3c8a0bb (commit)
       via  26b67f06ea50ac60529b9163e78d08da48c5bb84 (commit)
       via  d499c29573b2b1f2819e2859bde84f6f11c32579 (commit)
       via  9b094b09bd15ef3c6b7929b1635706158750144f (commit)
       via  2da0385d1f57fe00977d2e58022b3f9a6604192e (commit)
       via  24e81092a136e4a60443dc6a04206c2a631ace3a (commit)
       via  87eeed4c03ebb0847c093eeb8a6b7af5f2fd33af (commit)
       via  7b3d0898f8c655d1f82ff8cb4b4e6bb373de0e10 (commit)
       via  32ae20b88e80c0a0fec574e429ddf43f359c6e39 (commit)
       via  2c0f11dc7e66e10257ef927574a99d5f888c774c (commit)
       via  7730bd8fde61da83fefaaee062b66c02332ff28e (commit)
      from  2eeb6e08decb2dd3e793647a38596950278a1610 (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 e20567b044dd19cd0a70b5e0cfdf2bf925739f45
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e20567b044dd19cd0a70b5e0cfdf2bf925739f45
Author: Ben Pfaff <blp at nicira.com>
		
Merge "master" into "wdp".
		


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

Summary of changes:
 ChangeLog                                          |    9 +
 CodingStyle                                        |    9 +-
 INSTALL.Linux                                      |   21 +
 Makefile.am                                        |    1 +
 README                                             |    3 +
 acinclude.m4                                       |   67 +-
 configure.ac                                       |    6 +-
 datapath/Modules.mk                                |   15 +-
 datapath/actions.c                                 |   77 +-
 datapath/actions.h                                 |   20 +-
 datapath/datapath.c                                | 1262 +++++++----
 datapath/datapath.h                                |  105 +-
 datapath/dp_dev.c                                  |  271 ---
 datapath/dp_dev.h                                  |   34 -
 datapath/dp_notify.c                               |   30 +-
 datapath/dp_sysfs.h                                |    8 +-
 datapath/dp_sysfs_dp.c                             |   83 +-
 datapath/dp_sysfs_if.c                             |   64 +-
 datapath/flow.c                                    |   37 +-
 datapath/flow.h                                    |    9 +-
 datapath/linux-2.6/.gitignore                      |   12 +-
 datapath/linux-2.6/Makefile.main.in                |    1 -
 datapath/linux-2.6/Modules.mk                      |   41 +-
 ...f_core-ip_gre.c => addrconf_core-openvswitch.c} |    0 
 datapath/linux-2.6/compat-2.6/dev-ip_gre.c         |   63 -
 datapath/linux-2.6/compat-2.6/dev-openvswitch.c    |   13 +-
 .../linux-2.6/compat-2.6/include/linux/netdevice.h |   14 +-
 .../linux-2.6/compat-2.6/include/linux/percpu.h    |   10 -
 .../linux-2.6/compat-2.6/include/linux/rtnetlink.h |   28 +-
 .../linux-2.6/compat-2.6/include/linux/skbuff.h    |   11 +-
 datapath/linux-2.6/compat-2.6/include/linux/slab.h |   10 +
 datapath/linux-2.6/compat-2.6/include/net/ipip.h   |   85 -
 .../compat-2.6/include/net/net_namespace.h         |   29 -
 .../compat-2.6/include/net/netns/generic.h         |   19 -
 datapath/linux-2.6/compat-2.6/ip_gre.c             | 2356 --------------------
 ...{ip_output-ip_gre.c => ip_output-openvswitch.c} |    0 
 datapath/linux-2.6/compat-2.6/kmemdup.c            |   22 +
 .../linux-2.6/compat-2.6/net_namespace-ip_gre.c    |  117 -
 datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c |    5 +-
 datapath/linux-2.6/compat-2.6/veth.c               |   15 +-
 datapath/table.c                                   |  392 ++--
 datapath/table.h                                   |   44 +
 datapath/vport-gre.c                               | 1413 ++++++++++++
 datapath/vport-internal_dev.c                      |  389 ++++
 datapath/vport-internal_dev.h                      |   20 +
 datapath/vport-netdev.c                            |  381 ++++
 datapath/vport-netdev.h                            |   41 +
 datapath/vport.c                                   | 1240 ++++++++++
 datapath/vport.h                                   |  241 ++
 datapath/xflow-compat.h                            |   83 +
 debian/control                                     |    4 +-
 debian/corekeeper.init                             |    4 +-
 debian/openvswitch-controller.init                 |    8 +-
 debian/openvswitch-monitor.default                 |    4 +-
 debian/openvswitch-monitor.init                    |    8 +-
 debian/openvswitch-pki-server.postinst             |    2 +-
 debian/openvswitch-pki.postinst                    |    2 +-
 debian/openvswitch-switch-config.templates         |  103 +-
 debian/openvswitch-switch.init                     |   50 +-
 debian/openvswitch-switch.logrotate                |   26 +-
 debian/openvswitch-switch.postrm                   |    4 +-
 debian/openvswitch-switch.template                 |    2 +-
 debian/openvswitch-switchui.default                |    2 +-
 debian/openvswitch-switchui.init                   |    8 +-
 debian/openvswitch-wdt.init                        |    8 +-
 debian/ovs-switch-setup                            |   14 +-
 debian/ovs-switch-setup.8                          |   10 +-
 debian/po/templates.pot                            |  184 +-
 include/openflow/nicira-ext.h                      |   93 +-
 include/openvswitch/automake.mk                    |    1 +
 include/openvswitch/gre.h                          |   48 +-
 include/openvswitch/{gre.h => internal_dev.h}      |   53 +-
 include/openvswitch/xflow.h                        |   79 +-
 lib/automake.mk                                    |    4 +-
 lib/classifier.c                                   |   26 +-
 lib/classifier.h                                   |   11 +-
 lib/common.man                                     |    4 +-
 lib/daemon.c                                       |   30 +-
 lib/dhcp-client.c                                  |    2 +-
 lib/dynamic-string.c                               |    2 +-
 lib/dynamic-string.h                               |   17 +-
 lib/fatal-signal.c                                 |   11 +
 lib/flow.c                                         |   62 +-
 lib/flow.h                                         |   17 +-
 lib/jsonrpc.c                                      |   89 +-
 lib/jsonrpc.h                                      |   13 +-
 lib/leak-checker.man                               |   12 +-
 lib/learning-switch.c                              |    2 +-
 lib/netdev-gre.c                                   |  477 ++++
 lib/netdev-linux.c                                 |  803 +++-----
 lib/netdev-provider.h                              |   20 +-
 lib/netdev.c                                       |   53 +-
 lib/netdev.h                                       |    2 +
 lib/ofp-print.c                                    |   22 +-
 lib/ofpbuf.c                                       |   11 +
 lib/ofpbuf.h                                       |    3 +-
 lib/ovsdb-idl.c                                    |   10 +-
 lib/reconnect.c                                    |  138 +-
 lib/reconnect.h                                    |    8 +-
 lib/shash.c                                        |   15 +
 lib/shash.h                                        |    2 +
 lib/socket-util.c                                  |  109 +-
 lib/socket-util.h                                  |    3 +
 lib/ssl.man                                        |   11 +
 lib/stream-ssl.c                                   |   74 +-
 lib/stream.c                                       |  304 +++-
 lib/stream.h                                       |   30 +-
 lib/unixctl-syn.man                                |    2 +
 lib/unixctl.man                                    |    8 +
 lib/vconn-stream.c                                 |  143 +-
 lib/vconn.c                                        |   12 +-
 lib/vlog-modules.def                               |    2 +
 lib/xfif-linux.c                                   |   72 +-
 lib/xfif-netdev.c                                  |    7 +-
 lib/xfif-provider.h                                |   16 +-
 lib/xfif.c                                         |   14 +-
 lib/xflow-util.c                                   |   14 +-
 m4/openvswitch.m4                                  |   57 +
 ofproto/discovery.c                                |   12 +
 ofproto/discovery.h                                |    2 +
 ofproto/fail-open.c                                |  170 ++-
 ofproto/fail-open.h                                |   12 +-
 ofproto/in-band.c                                  |  847 +++++---
 ofproto/in-band.h                                  |   11 +-
 ofproto/ofproto-sflow.c                            |   41 +-
 ofproto/ofproto.c                                  | 1239 ++++++++---
 ofproto/ofproto.h                                  |   48 +-
 ofproto/pinsched.c                                 |    8 +
 ofproto/pinsched.h                                 |    2 +
 ofproto/status.c                                   |   11 -
 ofproto/wdp-xflow.c                                |   75 +-
 ofproto/wdp.c                                      |   13 +
 ofproto/wdp.h                                      |   13 +-
 ovsdb/OVSDB.py                                     |   20 +-
 ovsdb/SPECS                                        |    2 +
 ovsdb/automake.mk                                  |    2 +
 ovsdb/jsonrpc-server.c                             |    2 +-
 ovsdb/ovsdb-client.c                               |    4 +-
 ovsdb/ovsdb-doc.in                                 |   14 +-
 ovsdb/ovsdb-idlc.in                                |    9 +-
 ovsdb/ovsdb-server.1.in                            |    2 +
 ovsdb/ovsdb-server.c                               |    1 +
 ovsdb/ovsdbmonitor/.gitignore                      |    1 +
 ovsdb/ovsdbmonitor/COPYING                         |   13 +
 ovsdb/ovsdbmonitor/ConfigWindow.ui                 |  185 ++
 ovsdb/ovsdbmonitor/FlowWindow.ui                   |  216 ++
 ovsdb/ovsdbmonitor/HostWindow.ui                   |  145 ++
 ovsdb/ovsdbmonitor/LogWindow.ui                    |   71 +
 ovsdb/ovsdbmonitor/MainWindow.ui                   |  233 ++
 ovsdb/ovsdbmonitor/OVEApp.py                       |  105 +
 ovsdb/ovsdbmonitor/OVECommonWindow.py              |  221 ++
 ovsdb/ovsdbmonitor/OVEConfig.py                    |   85 +
 ovsdb/ovsdbmonitor/OVEConfigWindow.py              |  127 ++
 ovsdb/ovsdbmonitor/OVEFetch.py                     |  386 ++++
 ovsdb/ovsdbmonitor/OVEFlowWindow.py                |  325 +++
 ovsdb/ovsdbmonitor/OVEHostWindow.py                |   54 +
 ovsdb/ovsdbmonitor/OVELogWindow.py                 |   64 +
 ovsdb/ovsdbmonitor/OVELogger.py                    |   45 +
 ovsdb/ovsdbmonitor/OVEMainWindow.py                |  138 ++
 ovsdb/ovsdbmonitor/OVEStandard.py                  |   41 +
 ovsdb/ovsdbmonitor/OVEUtil.py                      |  139 ++
 ovsdb/ovsdbmonitor/Ui_ConfigWindow.py              |  106 +
 ovsdb/ovsdbmonitor/Ui_FlowWindow.py                |  136 ++
 ovsdb/ovsdbmonitor/Ui_HostWindow.py                |   75 +
 ovsdb/ovsdbmonitor/Ui_LogWindow.py                 |   42 +
 ovsdb/ovsdbmonitor/Ui_MainWindow.py                |  207 ++
 ovsdb/ovsdbmonitor/automake.mk                     |   48 +
 ovsdb/ovsdbmonitor/ovsdbmonitor.in                 |   39 +
 ovsdb/ovsdbmonitor/ovsdbmonitor.py.in              |   37 +
 ovsdb/ovsdbmonitor/qt4reactor.py                   |  331 +++
 tests/ovs-vsctl.at                                 |   91 +-
 tests/reconnect.at                                 |  120 +
 tests/test-classifier.c                            |    9 +-
 tests/test-flows.c                                 |    4 +-
 tests/test-jsonrpc.c                               |    6 +-
 tests/test-ovsdb.c                                 |   13 +-
 tests/test-reconnect.c                             |   21 +
 utilities/ovs-controller.8.in                      |   25 +-
 utilities/ovs-controller.c                         |   12 +-
 utilities/ovs-dpctl.c                              |    9 +-
 utilities/ovs-monitor                              |    6 +-
 utilities/ovs-ofctl.8.in                           |   65 +-
 utilities/ovs-ofctl.c                              |  103 +-
 utilities/ovs-openflowd.8.in                       |   43 +-
 utilities/ovs-openflowd.c                          |  159 +-
 utilities/ovs-vsctl.8.in                           |   43 +-
 utilities/ovs-vsctl.c                              |  354 +++-
 vswitchd/bridge.c                                  |  714 ++++---
 vswitchd/ovs-brcompatd.c                           |    4 +-
 vswitchd/ovs-vswitchd.8.in                         |    4 +
 vswitchd/ovs-vswitchd.c                            |   17 +-
 vswitchd/vswitch.ovsschema                         |    4 +-
 vswitchd/vswitch.xml                               |  255 ++-
 xenserver/automake.mk                              |    8 +
 xenserver/etc_init.d_openvswitch                   |  276 +--
 xenserver/etc_logrotate.d_openvswitch              |    2 +-
 .../etc_xapi.d_plugins_openvswitch-cfg-update      |   28 +-
 xenserver/etc_xensource_scripts_vif                |  181 +-
 xenserver/openvswitch-xen.spec                     |   48 +-
 .../opt_xensource_libexec_InterfaceReconfigure.py  |    2 +-
 xenserver/ovs-xenserverd.8.in                      |   40 +
 xenserver/ovs-xenserverd.c                         |  246 ++
 ..._lib_xsconsole_plugins-base_XSFeatureVSwitch.py |   43 +-
 xenserver/usr_sbin_brctl                           |   11 +-
 ...share_openvswitch_scripts_refresh-network-uuids |   33 +-
 ...sr_share_openvswitch_scripts_sysconfig.template |    8 +
 206 files changed, 15191 insertions(+), 6678 deletions(-)
 delete mode 100644 datapath/dp_dev.c
 delete mode 100644 datapath/dp_dev.h
 rename datapath/linux-2.6/compat-2.6/{addrconf_core-ip_gre.c => addrconf_core-openvswitch.c} (100%)
 delete mode 100644 datapath/linux-2.6/compat-2.6/dev-ip_gre.c
 delete mode 100644 datapath/linux-2.6/compat-2.6/include/linux/percpu.h
 create mode 100644 datapath/linux-2.6/compat-2.6/include/linux/slab.h
 delete mode 100644 datapath/linux-2.6/compat-2.6/include/net/ipip.h
 delete mode 100644 datapath/linux-2.6/compat-2.6/include/net/net_namespace.h
 delete mode 100644 datapath/linux-2.6/compat-2.6/include/net/netns/generic.h
 delete mode 100644 datapath/linux-2.6/compat-2.6/ip_gre.c
 rename datapath/linux-2.6/compat-2.6/{ip_output-ip_gre.c => ip_output-openvswitch.c} (100%)
 create mode 100644 datapath/linux-2.6/compat-2.6/kmemdup.c
 delete mode 100644 datapath/linux-2.6/compat-2.6/net_namespace-ip_gre.c
 create mode 100644 datapath/table.h
 create mode 100644 datapath/vport-gre.c
 create mode 100644 datapath/vport-internal_dev.c
 create mode 100644 datapath/vport-internal_dev.h
 create mode 100644 datapath/vport-netdev.c
 create mode 100644 datapath/vport-netdev.h
 create mode 100644 datapath/vport.c
 create mode 100644 datapath/vport.h
 create mode 100644 datapath/xflow-compat.h
 copy include/openvswitch/{gre.h => internal_dev.h} (71%)
 create mode 100644 lib/netdev-gre.c
 create mode 100644 lib/unixctl-syn.man
 create mode 100644 lib/unixctl.man
 create mode 100644 ovsdb/ovsdbmonitor/.gitignore
 create mode 100644 ovsdb/ovsdbmonitor/COPYING
 create mode 100644 ovsdb/ovsdbmonitor/ConfigWindow.ui
 create mode 100644 ovsdb/ovsdbmonitor/FlowWindow.ui
 create mode 100644 ovsdb/ovsdbmonitor/HostWindow.ui
 create mode 100644 ovsdb/ovsdbmonitor/LogWindow.ui
 create mode 100644 ovsdb/ovsdbmonitor/MainWindow.ui
 create mode 100644 ovsdb/ovsdbmonitor/OVEApp.py
 create mode 100644 ovsdb/ovsdbmonitor/OVECommonWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEConfig.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEConfigWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEFetch.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEFlowWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEHostWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVELogWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVELogger.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEMainWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEStandard.py
 create mode 100644 ovsdb/ovsdbmonitor/OVEUtil.py
 create mode 100644 ovsdb/ovsdbmonitor/Ui_ConfigWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/Ui_FlowWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/Ui_HostWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/Ui_LogWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/Ui_MainWindow.py
 create mode 100644 ovsdb/ovsdbmonitor/automake.mk
 create mode 100755 ovsdb/ovsdbmonitor/ovsdbmonitor.in
 create mode 100755 ovsdb/ovsdbmonitor/ovsdbmonitor.py.in
 create mode 100644 ovsdb/ovsdbmonitor/qt4reactor.py
 create mode 100644 xenserver/ovs-xenserverd.8.in
 create mode 100644 xenserver/ovs-xenserverd.c


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list