This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/vcl.git

commit 2950d9d4604de78ff6aa60af6b29912573c7aaa3
Merge: 6327225 413f6f2
Author: Josh Thompson <[email protected]>
AuthorDate: Thu Jul 25 10:37:32 2019 -0400

    Merge branch 'release-2.5.1'

 CHANGELOG                                          |  50 ++
 INSTALLATION                                       |  41 +-
 README                                             |  25 +-
 RELEASE_NOTES                                      |  31 +-
 UPGRADE                                            |  86 +-
 doap_vcl.rdf                                       |   7 +
 managementnode/bin/health_check.pl                 |   2 +-
 managementnode/bin/install_perl_libs.pl            |  18 +-
 managementnode/bin/monitor_vcld.pl                 |  24 +-
 managementnode/bin/upgrade_database.pl             |   2 +-
 managementnode/bin/vcld                            |   2 +-
 managementnode/bin/vclmessages.pl                  | 218 +++++
 managementnode/lib/VCL/DataStructure.pm            |  35 +-
 managementnode/lib/VCL/Module.pm                   |   2 +-
 managementnode/lib/VCL/Module/OS.pm                |  16 +-
 managementnode/lib/VCL/Module/OS/Linux.pm          |  36 +-
 managementnode/lib/VCL/Module/OS/Linux/ESXi.pm     |   2 +-
 .../lib/VCL/Module/OS/Linux/ManagementNode.pm      |   9 +-
 managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm   |   4 +-
 managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm  |   2 +-
 managementnode/lib/VCL/Module/OS/Linux/firewall.pm |   2 +-
 .../lib/VCL/Module/OS/Linux/firewall/firewalld.pm  |   2 +-
 .../lib/VCL/Module/OS/Linux/firewall/iptables.pm   |   2 +-
 .../lib/VCL/Module/OS/Linux/firewall/ufw.pm        |   2 +-
 managementnode/lib/VCL/Module/OS/Linux/init.pm     |   2 +-
 .../lib/VCL/Module/OS/Linux/init/SysV.pm           |   2 +-
 .../lib/VCL/Module/OS/Linux/init/Upstart.pm        |   2 +-
 .../lib/VCL/Module/OS/Linux/init/systemd.pm        |   2 +-
 managementnode/lib/VCL/Module/OS/OSX.pm            |   2 +-
 managementnode/lib/VCL/Module/OS/Windows.pm        | 563 ++++++++++--
 .../lib/VCL/Module/OS/Windows/Version_10/10.pm     |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_10/2016.pm   |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_5.pm         |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_5/2003.pm    |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_5/XP.pm      |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6.pm         |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6/2008.pm    |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6/2012.pm    |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6/7.pm       |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6/8.pm       |   2 +-
 .../lib/VCL/Module/OS/Windows/Version_6/Vista.pm   |   2 +-
 managementnode/lib/VCL/Module/Predictive.pm        |   2 +-
 .../lib/VCL/Module/Predictive/Level_0.pm           |   2 +-
 .../lib/VCL/Module/Predictive/Level_1.pm           |   2 +-
 .../lib/VCL/Module/Predictive/Level_2.pm           |   2 +-
 managementnode/lib/VCL/Module/Provisioning.pm      |   2 +-
 managementnode/lib/VCL/Module/Provisioning/Lab.pm  |   2 +-
 .../lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm  |   8 +-
 .../lib/VCL/Module/Provisioning/VMware/VMware.pm   |  11 +-
 .../VCL/Module/Provisioning/VMware/vSphere_SDK.pm  |  10 +-
 .../VCL/Module/Provisioning/VMware/vmware_cmd.pm   |   2 +-
 .../lib/VCL/Module/Provisioning/docker.pm          |   2 +-
 .../lib/VCL/Module/Provisioning/libvirt.pm         |  72 +-
 .../lib/VCL/Module/Provisioning/libvirt/KVM.pm     |  14 +-
 managementnode/lib/VCL/Module/Provisioning/one.pm  |   2 +-
 .../lib/VCL/Module/Provisioning/openstack.pm       |   2 +-
 managementnode/lib/VCL/Module/Provisioning/vbox.pm |   2 +-
 managementnode/lib/VCL/Module/Provisioning/xCAT.pm |   2 +-
 managementnode/lib/VCL/Module/Semaphore.pm         |   2 +-
 managementnode/lib/VCL/Module/State.pm             |   2 +-
 managementnode/lib/VCL/blockrequest.pm             |   2 +-
 managementnode/lib/VCL/healthcheck.pm              |   2 +-
 managementnode/lib/VCL/image.pm                    |   2 +-
 managementnode/lib/VCL/inuse.pm                    |   2 +-
 managementnode/lib/VCL/makeproduction.pm           |   2 +-
 managementnode/lib/VCL/new.pm                      |   2 +-
 managementnode/lib/VCL/reclaim.pm                  |   2 +-
 managementnode/lib/VCL/reserved.pm                 |   2 +-
 managementnode/lib/VCL/utils.pm                    | 114 +--
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/ESXi/Scripts/post_load/.gitignore        |  11 +
 .../tools/ESXi/Scripts/post_reservation/.gitignore |  11 +
 .../tools/ESXi/Scripts/post_reserve/.gitignore     |  11 +
 .../tools/ESXi/Scripts/pre_capture/.gitignore      |  11 +
 .../tools/ESXi/Scripts/pre_reload/.gitignore       |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Linux/Scripts/post_load/.gitignore       |  11 +
 .../Linux/Scripts/post_reservation/.gitignore      |  11 +
 .../tools/Linux/Scripts/post_reserve/.gitignore    |  11 +
 .../tools/Linux/Scripts/pre_capture/.gitignore     |  11 +
 .../tools/Linux/Scripts/pre_reload/.gitignore      |  11 +
 .../ManagementNode/Scripts/post_capture/.gitignore |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../ManagementNode/Scripts/post_load/.gitignore    |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../ManagementNode/Scripts/post_reserve/.gitignore |  11 +
 .../ManagementNode/Scripts/pre_capture/.gitignore  |  11 +
 .../ManagementNode/Scripts/pre_reload/.gitignore   |  11 +
 .../OSX/Scripts/post_initial_connection/.gitignore |  11 +
 .../tools/OSX/Scripts/post_load/.gitignore         |  11 +
 .../tools/OSX/Scripts/post_reservation/.gitignore  |  11 +
 .../tools/OSX/Scripts/post_reserve/.gitignore      |  11 +
 .../tools/OSX/Scripts/pre_capture/.gitignore       |  11 +
 .../tools/OSX/Scripts/pre_reload/.gitignore        |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Ubuntu/Scripts/post_load/.gitignore      |  11 +
 .../Ubuntu/Scripts/post_reservation/.gitignore     |  11 +
 .../tools/Ubuntu/Scripts/post_reserve/.gitignore   |  11 +
 .../tools/Ubuntu/Scripts/pre_capture/.gitignore    |  11 +
 .../tools/Ubuntu/Scripts/pre_reload/.gitignore     |  11 +
 managementnode/tools/Windows/Drivers/.gitignore    |  11 +
 managementnode/tools/Windows/Logs/.gitignore       |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Windows/Scripts/post_load/.gitignore     |  11 +
 .../Windows/Scripts/post_reservation/.gitignore    |  11 +
 .../tools/Windows/Scripts/post_reserve/.gitignore  |  11 +
 .../tools/Windows/Scripts/pre_capture/.gitignore   |  11 +
 .../tools/Windows/Scripts/pre_reload/.gitignore    |  11 +
 .../tools/Windows/Updates/x86/.gitignore           |  11 +
 .../tools/Windows/Updates/x86_64/.gitignore        |  11 +
 .../tools/Windows/Utilities/WSName/.gitignore      |  11 +
 managementnode/tools/Windows_10/Drivers/.gitignore |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Windows_10/Scripts/post_load/.gitignore  |  11 +
 .../Windows_10/Scripts/post_reservation/.gitignore |  11 +
 .../Windows_10/Scripts/post_reserve/.gitignore     |  11 +
 .../Windows_10/Scripts/pre_capture/.gitignore      |  11 +
 .../tools/Windows_10/Scripts/pre_reload/.gitignore |  11 +
 managementnode/tools/Windows_10/Updates/.gitignore |  11 +
 .../tools/Windows_10/Utilities/.gitignore          |  11 +
 managementnode/tools/Windows_7/Drivers/.gitignore  |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Windows_7/Scripts/post_load/.gitignore   |  11 +
 .../Windows_7/Scripts/post_reservation/.gitignore  |  11 +
 .../Windows_7/Scripts/post_reserve/.gitignore      |  11 +
 .../tools/Windows_7/Scripts/pre_capture/.gitignore |  11 +
 .../tools/Windows_7/Scripts/pre_reload/.gitignore  |  11 +
 .../tools/Windows_7/Updates/x86/.gitignore         |  11 +
 .../tools/Windows_7/Updates/x86_64/.gitignore      |  11 +
 .../tools/Windows_7/Utilities/.gitignore           |  11 +
 managementnode/tools/Windows_8/Drivers/.gitignore  |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Windows_8/Scripts/post_load/.gitignore   |  11 +
 .../Windows_8/Scripts/post_reservation/.gitignore  |  11 +
 .../Windows_8/Scripts/post_reserve/.gitignore      |  11 +
 .../tools/Windows_8/Scripts/pre_capture/.gitignore |  11 +
 .../tools/Windows_8/Scripts/pre_reload/.gitignore  |  11 +
 managementnode/tools/Windows_8/Updates/.gitignore  |  11 +
 .../tools/Windows_8/Utilities/.gitignore           |  11 +
 .../tools/Windows_Server_2003/Drivers/.gitignore   |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Scripts/post_load/.gitignore                   |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../Windows_Server_2003/Updates/x86/.gitignore     |  11 +
 .../Windows_Server_2003/Updates/x86_64/.gitignore  |  11 +
 .../Utilities/Sysprep/.gitignore                   |  11 +
 .../tools/Windows_Server_2008/Drivers/.gitignore   |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Scripts/post_load/.gitignore                   |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../Windows_Server_2008/Updates/x86/.gitignore     |  11 +
 .../Windows_Server_2008/Updates/x86_64/.gitignore  |  11 +
 .../tools/Windows_Server_2008/Utilities/.gitignore |  11 +
 .../tools/Windows_Server_2012/Drivers/.gitignore   |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Scripts/post_load/.gitignore                   |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../tools/Windows_Server_2012/Updates/.gitignore   |  11 +
 .../tools/Windows_Server_2012/Utilities/.gitignore |  11 +
 .../tools/Windows_Server_2016/Drivers/.gitignore   |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Scripts/post_load/.gitignore                   |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../tools/Windows_Server_2016/Updates/.gitignore   |  11 +
 .../tools/Windows_Server_2016/Utilities/.gitignore |  11 +
 .../tools/Windows_Version_5/Drivers/.gitignore     |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Windows_Version_5/Scripts/post_load/.gitignore |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../tools/Windows_Version_5/Updates/x86/.gitignore |  11 +
 .../Windows_Version_5/Updates/x86_64/.gitignore    |  11 +
 .../tools/Windows_Version_6/Drivers/.gitignore     |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Windows_Version_6/Scripts/post_load/.gitignore |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Scripts/post_reserve/.gitignore                |  11 +
 .../Scripts/pre_capture/.gitignore                 |  11 +
 .../Scripts/pre_reload/.gitignore                  |  11 +
 .../tools/Windows_Version_6/Updates/x86/.gitignore |  11 +
 .../Windows_Version_6/Updates/x86_64/.gitignore    |  11 +
 .../tools/Windows_Vista/Drivers/.gitignore         |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../Windows_Vista/Scripts/post_load/.gitignore     |  11 +
 .../Scripts/post_reservation/.gitignore            |  11 +
 .../Windows_Vista/Scripts/post_reserve/.gitignore  |  11 +
 .../Windows_Vista/Scripts/pre_capture/.gitignore   |  11 +
 .../Windows_Vista/Scripts/pre_reload/.gitignore    |  11 +
 .../tools/Windows_Vista/Updates/x86/.gitignore     |  11 +
 .../tools/Windows_Vista/Updates/x86_64/.gitignore  |  11 +
 managementnode/tools/Windows_XP/Drivers/.gitignore |  11 +
 .../Scripts/post_initial_connection/.gitignore     |  11 +
 .../tools/Windows_XP/Scripts/post_load/.gitignore  |  11 +
 .../Windows_XP/Scripts/post_reservation/.gitignore |  11 +
 .../Windows_XP/Scripts/post_reserve/.gitignore     |  11 +
 .../Windows_XP/Scripts/pre_capture/.gitignore      |  11 +
 .../tools/Windows_XP/Scripts/pre_reload/.gitignore |  11 +
 .../tools/Windows_XP/Updates/x86/.gitignore        |  11 +
 .../tools/Windows_XP/Updates/x86_64/.gitignore     |  11 +
 .../tools/Windows_XP/Utilities/Sysprep/.gitignore  |  11 +
 mysql/update-vcl.sql                               |  64 +-
 mysql/vcl.sql                                      | 328 +++----
 vcl-install.sh                                     |  18 +-
 vcl-upgrade.sh                                     |  18 +-
 web/.gitignore                                     |  13 +
 web/.ht-inc/addomain.php                           |  32 +-
 web/.ht-inc/authentication.php                     | 267 +++---
 web/.ht-inc/authmethods/itecsauth.php              | 109 ++-
 web/.ht-inc/authmethods/ldapauth.php               | 171 +++-
 web/.ht-inc/authmethods/shibauth.php               | 374 +++++++-
 web/.ht-inc/blockallocations.php                   | 181 ++--
 web/.ht-inc/computer.php                           | 105 ++-
 web/.ht-inc/conf-default.php                       |  17 +-
 web/.ht-inc/config.php                             |  44 +-
 web/.ht-inc/dashboard.php                          |  79 +-
 web/.ht-inc/doxyfile.xmlrpc                        |  54 --
 web/.ht-inc/groups.php                             |  28 +-
 web/.ht-inc/help.php                               |  99 ++-
 web/.ht-inc/image.php                              | 112 +--
 web/.ht-inc/managementnode.php                     |  18 +-
 web/.ht-inc/oneclick.php                           |   4 +-
 web/.ht-inc/privileges.php                         | 109 ++-
 web/.ht-inc/requests.php                           | 170 ++--
 web/.ht-inc/resource.php                           |   9 +-
 web/.ht-inc/schedule.php                           |   4 +-
 web/.ht-inc/secrets-default.php                    |   2 +-
 web/.ht-inc/serverprofiles.php                     |  51 +-
 web/.ht-inc/siteconfig.php                         |  93 +-
 web/.ht-inc/sitemaintenance.php                    |   8 +-
 web/.ht-inc/states.php                             |  10 +-
 web/.ht-inc/statistics.php                         |  68 +-
 web/.ht-inc/userpreferences.php                    |   4 +-
 web/.ht-inc/utils.php                              | 961 ++++++++++-----------
 web/.ht-inc/vm.php                                 |  45 +-
 web/.ht-inc/xmlrpcWrappers.php                     | 140 +--
 web/index.php                                      |  17 +-
 web/js/code.js                                     |   2 +-
 web/js/dashboard.js                                |   3 +
 web/js/nls/es_CR/messages.js                       |   7 +-
 web/js/nls/es_MX/messages.js                       |   7 +-
 web/js/nls/fr_CA/messages.js                       |   7 +-
 web/js/nls/messages.js.template                    |   7 +-
 web/js/nls/pt_PT/messages.js                       |   7 +-
 web/js/requests.js                                 |  11 +-
 web/js/resources/addomain.js                       |  25 +-
 web/js/resources/computer.js                       |  32 +-
 web/js/resources/image.js                          |  37 +-
 web/js/siteconfig.js                               |  17 +-
 web/js/vm.js                                       |  16 +-
 web/locale/es_CR/LC_MESSAGES/vcl.mo                | Bin 134931 -> 134926 bytes
 web/locale/es_MX/LC_MESSAGES/vcl.mo                | Bin 37087 -> 37095 bytes
 web/locale/fr_CA/LC_MESSAGES/vcl.mo                | Bin 96713 -> 96708 bytes
 web/locale/ja_JP/LC_MESSAGES/vcl.mo                | Bin 67604 -> 67606 bytes
 web/locale/po_files/es_CR/vcl.po                   | 303 ++++++-
 web/locale/po_files/es_MX/vcl.po                   | 305 ++++++-
 web/locale/po_files/fr_CA/vcl.po                   | 303 ++++++-
 web/locale/po_files/ja_JP/vcl.po                   |   2 +-
 web/locale/po_files/pt_PT/vcl.po                   | 321 ++++++-
 web/locale/po_files/vcl.po.template                | 302 ++++++-
 web/locale/po_files/zh_CN/vcl.po                   |   2 +-
 web/locale/pt_PT/LC_MESSAGES/vcl.mo                | Bin 94991 -> 94993 bytes
 web/locale/zh_CN/LC_MESSAGES/vcl.mo                | Bin 31914 -> 31916 bytes
 web/shibauth/index.php                             | 263 +-----
 web/testsetup.php                                  |  17 +-
 web/themes/copydojocss.sh                          |  11 +-
 279 files changed, 6734 insertions(+), 2182 deletions(-)

Reply via email to