[Openvpn-commits] SF.net Git: OpenVPN with experimental and new features - which requires a lot of testing branch, allmerged, updated. v2.2-RC-272-gb22960b

[<ope...@li...>]

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 "OpenVPN with experimental and new features - which requires a lot of testing".

The branch, allmerged has been updated
       via  b22960b0aa74324349a0db00522be74218ae2dfc (commit)
       via  b641463633ccdf487bdefd4e0ee1d09d2510a0cc (commit)
       via  2b7e41f39f54b68b515c9aa9053ca07bf54974a8 (commit)
       via  451c5bcb48163482666e3b4bfffd65679e8418b9 (commit)
       via  7ae7ba4ec604011d21079cb09e3fc835905c6ffd (commit)
       via  4c4b8cedfa98e8892a53eadd154836f8fa8cea7a (commit)
       via  26eaa885b0a84e5a020c7d463a261f3d819af7a1 (commit)
       via  55f698d92ecf8811e62f077f8a6db4e31e963b91 (commit)
       via  77d24405096452541700fb24aacd6f8a589fce3b (commit)
       via  c75a8976f070ef86cfced71b3df5cbce0e32e01a (commit)
       via  3b315a57d579d9ba8e259216f722094f1c1dbcde (commit)
       via  21c60e9f11d8d53c11611ea66698afea9c0350ef (commit)
       via  4e4aa65e9df1bfe4b9726eacea2c75cad32c0927 (commit)
       via  26e127cd59e07825a0785db2247fdac76ff01693 (commit)
       via  5e0b636ba6cb26a69ce5e863526e44d0fbd33ffc (commit)
       via  a7f0fc316caf3fbbe7c75866b4d8d21e2e931fc1 (commit)
       via  8c1c666e65db37fe680f7760c6ef52c2dd031932 (commit)
       via  292cf21a64b4afb3b22a6ba19967f965b486600a (commit)
       via  3b44aa49400647b785721e77da9c5e38eeb9fd83 (commit)
       via  a8220492b30f2780c55c57d110253f310c170b73 (commit)
       via  9e178ebe41233c228a3f76c1adb623a633057249 (commit)
       via  da51a175ed364ae8d41950858d8ebb2a25b742ee (commit)
       via  980d44047f4ab1541f80df1c9c2cfe6a2c572af8 (commit)
       via  c994385048a64adb3ec3e8f5f906c5f8668e1a71 (commit)
       via  bc454059ce843c580dee2141813b4e82d45fcbc3 (commit)
       via  fbd18db6485e3d08d8d933263cff96ee60eddb39 (commit)
       via  709271e8af5d19472cb200956bcc9b756a655f77 (commit)
       via  14f7e0f2d58ad12f3a206b38bae2464ebc0a98f4 (commit)
       via  f437ac7aded5e6c30b5543ff0a8531552d16c212 (commit)
       via  4729263dbe01afc078d6b7cf7167122d50e65533 (commit)
       via  38f110bb87aa60a2c8a4a4f653685a63c2036227 (commit)
       via  529df9922d85574828d95020eebcd228ba3a8164 (commit)
       via  eb208d36d466a1725e20e0a7aef39b1114b99e78 (commit)
       via  4b519cf51d02daacb388eb90bd0c5930145d7a0d (commit)
       via  513a53284158c6fe3b4c89b59eb10029639407b5 (commit)
       via  1aa664cef51e4b4ed4b35e569925acb4fd7b9b52 (commit)
       via  61c40649de994c8f2ce713389294134aeb6cc8a7 (commit)
       via  8367889e8467ce73b051aa8db64b0336aea8ed4b (commit)
       via  0bb41e58782ae9834a61491c5964bc9816b76bc8 (commit)
       via  4bf989571a74f90bb5d783072919862d2b64034e (commit)
       via  6cc43bf573700b2391ae462651190a3b209da2c8 (commit)
       via  238f81b9097c6ec70be3080b23cce46ad635e54c (commit)
       via  2e8337de248ef0b5b48cbb2964da0d5c3f28b15b (commit)
       via  8bebb729a53ae423d0867648f0c12868a96cafde (commit)
       via  c2533d18ce6da1bd43502f9f2923541c578864e9 (commit)
       via  aa6e58ae0e110eb92775aa1982f5f363057bcd43 (commit)
       via  3ee62caf112c1e8c9a79079b0cb0648446915caa (commit)
       via  043b61b2a5a30d5d45b15e9f8de7b72052225727 (commit)
       via  d94049b8284cdddd90fc17cc171fbf20fcc12780 (commit)
       via  6dc60191ddf8673db7d156e6b90fb794e4fa350a (commit)
       via  d04b8582a8d9cda4e886019c81f24712663e97b4 (commit)
       via  39238d1b173d8b7f08e061dd51e30605ce722e92 (commit)
       via  0c1f7ad5e84e7a79bd3f982cba5dad3cc12dbebb (commit)
      from  ae1de75c0fa5e4802218193e8441dbfa95a6f75c (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 b22960b0aa74324349a0db00522be74218ae2dfc
Merge: b641463633ccdf487bdefd4e0ee1d09d2510a0cc ae1de75c0fa5e4802218193e8441dbfa95a6f75c
Author: David Sommerseth <da...@re...>
Date:   Mon Feb 28 17:02:24 2011 +0100

    Merge remote-tracking branch 'origin/allmerged' into allmerged

commit b641463633ccdf487bdefd4e0ee1d09d2510a0cc
Merge: 451c5bcb48163482666e3b4bfffd65679e8418b9 2b7e41f39f54b68b515c9aa9053ca07bf54974a8
Author: David Sommerseth <da...@re...>
Date:   Mon Feb 28 16:55:32 2011 +0100

    Merge branch 'bugfix2.1' into allmerged

commit 451c5bcb48163482666e3b4bfffd65679e8418b9
Merge: 7ae7ba4ec604011d21079cb09e3fc835905c6ffd 4c4b8cedfa98e8892a53eadd154836f8fa8cea7a
Author: David Sommerseth <da...@re...>
Date:   Mon Feb 28 16:33:19 2011 +0100

    Merge branch 'bugfix2.1' into allmerged

commit 7ae7ba4ec604011d21079cb09e3fc835905c6ffd
Merge: c0f8e9f19842db532d6f07b0cc6486cc86be7566 26eaa885b0a84e5a020c7d463a261f3d819af7a1
Author: David Sommerseth <da...@re...>
Date:   Mon Feb 28 16:32:30 2011 +0100

    Merge branch 'beta2.2' into allmerged
    
    The following conflicts are basically due to the needed
    changes for the Python build tools on Windows.
    
    Conflicts:
    	options.c
    	service-win32/openvpnserv.c
    	version.m4
    	win/build.py
    	win/settings.in
    
    Signed-off-by: David Sommerseth <da...@re...>

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

Summary of changes:
 ChangeLog                          |  100 ++++++++++++-
 Makefile.am                        |    6 +-
 config-win32.h                     |    3 +
 plugin.h                           |    4 +-
 service-win32/msvc.mak             |   30 ++++
 service-win32/openvpnserv.c        |    3 +-
 ssl.c                              |    2 +-
 version.m4                         |    2 +-
 win/build.py                       |   15 ++-
 win/build_all.py                   |   23 ++-
 win/build_ddk.py                   |    1 +
 win/config.py                      |    4 +-
 win/make_dist.py                   |   28 +++-
 win/msvc.mak.in                    |   32 ++--
 {install-win32 => win}/openvpn.nsi |  284 +++++++++++++-----------------------
 {install-win32 => win}/setpath.nsi |    0
 win/settings.in                    |   40 +++--
 win/show.py                        |    5 +-
 win/wb.py                          |   96 ++++++++++++
 19 files changed, 437 insertions(+), 241 deletions(-)
 create mode 100644 service-win32/msvc.mak
 copy {install-win32 => win}/openvpn.nsi (79%)
 copy {install-win32 => win}/setpath.nsi (100%)


hooks/post-receive
-- 
OpenVPN with experimental and new features - which requires a lot of testing