You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@vcl.apache.org by jf...@apache.org on 2019/07/19 14:13:51 UTC

[vcl] 04/13: Merge branch 'develop' into VCL-1114_misc_small_web_updates

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

jfthomps pushed a commit to branch VCL-1114_misc_small_web_updates
in repository https://gitbox.apache.org/repos/asf/vcl.git

commit 9fc8291223c41574ac4052c31d99da44fcb45c23
Merge: 5cd049b 0ee8921
Author: Josh Thompson <jf...@ncsu.edu>
AuthorDate: Tue May 21 16:06:52 2019 -0400

    Merge branch 'develop' into VCL-1114_misc_small_web_updates

 managementnode/lib/VCL/DataStructure.pm     |  1 +
 managementnode/lib/VCL/Module/OS/Windows.pm | 26 +++++++++++++++++---------
 mysql/update-vcl.sql                        |  1 +
 mysql/vcl.sql                               |  1 +
 vcl-install.sh                              |  4 ++--
 vcl-upgrade.sh                              |  6 +++---
 web/.ht-inc/addomain.php                    | 20 ++++++++++++++++----
 web/.ht-inc/utils.php                       |  8 +++++---
 web/js/resources/addomain.js                | 15 +++++++++++----
 9 files changed, 57 insertions(+), 25 deletions(-)