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 2018/06/06 20:07:17 UTC

[1/2] vcl git commit: VCL-1079 - Virtual Hosts page references Computer Utilities

Repository: vcl
Updated Branches:
  refs/heads/develop a087631ac -> d318bc08f


VCL-1079 - Virtual Hosts page references Computer Utilities

vm.php: modified editVMInfo: changed "Computer Utilities" to "Edit
Computer Profiles"


Project: http://git-wip-us.apache.org/repos/asf/vcl/repo
Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/a77c878f
Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/a77c878f
Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/a77c878f

Branch: refs/heads/develop
Commit: a77c878f82879433fca63c022d74df964d5306bc
Parents: 2b87efb
Author: Josh Thompson <jf...@ncsu.edu>
Authored: Wed Jun 6 16:03:12 2018 -0400
Committer: Josh Thompson <jf...@ncsu.edu>
Committed: Wed Jun 6 16:03:12 2018 -0400

----------------------------------------------------------------------
 web/.ht-inc/vm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vcl/blob/a77c878f/web/.ht-inc/vm.php
----------------------------------------------------------------------
diff --git a/web/.ht-inc/vm.php b/web/.ht-inc/vm.php
index 5375cdf..0616d9b 100644
--- a/web/.ht-inc/vm.php
+++ b/web/.ht-inc/vm.php
@@ -47,7 +47,7 @@ function editVMInfo() {
 	print "</div>\n";
 
 	$newmsg = "To create a new Virtual Host, change the state of a computer to<br>\n"
-	        . "'vmhostinuse' under Manage Computers-&gt;Computer Utilities.<br><br>\n";
+	        . "'vmhostinuse' under Manage Computers-&gt;Edit Computer Profiles.<br><br>\n";
 	$vmhosts = getVMHostData();
 	$resources = getUserResources(array("computerAdmin"), array("administer"));
 	foreach($vmhosts as $key => $value) {


[2/2] vcl git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/vcl into develop

Posted by jf...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/vcl into develop


Project: http://git-wip-us.apache.org/repos/asf/vcl/repo
Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/d318bc08
Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/d318bc08
Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/d318bc08

Branch: refs/heads/develop
Commit: d318bc08f18046045eaed3678710751d859ed6b8
Parents: a77c878 a087631
Author: Josh Thompson <jf...@ncsu.edu>
Authored: Wed Jun 6 16:04:55 2018 -0400
Committer: Josh Thompson <jf...@ncsu.edu>
Committed: Wed Jun 6 16:04:55 2018 -0400

----------------------------------------------------------------------
 managementnode/bin/install_perl_libs.pl                  |  1 +
 managementnode/lib/VCL/Module/OS.pm                      |  4 ++++
 managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm |  7 +++++++
 managementnode/lib/VCL/Module/OS/Windows.pm              |  7 ++++++-
 .../lib/VCL/Module/Provisioning/VMware/VMware.pm         |  2 +-
 managementnode/lib/VCL/utils.pm                          | 10 ++++------
 .../ESXi/Scripts/post_initial_connection/.gitignore      | 11 +++++++++++
 managementnode/tools/ESXi/Scripts/post_load/.gitignore   | 11 +++++++++++
 .../tools/ESXi/Scripts/post_reservation/.gitignore       | 11 +++++++++++
 .../tools/ESXi/Scripts/post_reserve/.gitignore           | 11 +++++++++++
 managementnode/tools/ESXi/Scripts/pre_capture/.gitignore | 11 +++++++++++
 managementnode/tools/ESXi/Scripts/pre_reload/.gitignore  | 11 +++++++++++
 .../Linux/Scripts/post_initial_connection/.gitignore     | 11 +++++++++++
 managementnode/tools/Linux/Scripts/post_load/.gitignore  | 11 +++++++++++
 .../tools/Linux/Scripts/post_reservation/.gitignore      | 11 +++++++++++
 .../tools/Linux/Scripts/post_reserve/.gitignore          | 11 +++++++++++
 .../tools/Linux/Scripts/pre_capture/.gitignore           | 11 +++++++++++
 managementnode/tools/Linux/Scripts/pre_reload/.gitignore | 11 +++++++++++
 .../tools/ManagementNode/Scripts/post_capture/.gitignore | 11 +++++++++++
 .../Scripts/post_initial_connection/.gitignore           | 11 +++++++++++
 .../tools/ManagementNode/Scripts/post_load/.gitignore    | 11 +++++++++++
 .../ManagementNode/Scripts/post_reservation/.gitignore   | 11 +++++++++++
 .../tools/ManagementNode/Scripts/post_reserve/.gitignore | 11 +++++++++++
 .../tools/ManagementNode/Scripts/pre_capture/.gitignore  | 11 +++++++++++
 .../tools/ManagementNode/Scripts/pre_reload/.gitignore   | 11 +++++++++++
 .../tools/OSX/Scripts/post_initial_connection/.gitignore | 11 +++++++++++
 managementnode/tools/OSX/Scripts/post_load/.gitignore    | 11 +++++++++++
 .../tools/OSX/Scripts/post_reservation/.gitignore        | 11 +++++++++++
 managementnode/tools/OSX/Scripts/post_reserve/.gitignore | 11 +++++++++++
 managementnode/tools/OSX/Scripts/pre_capture/.gitignore  | 11 +++++++++++
 managementnode/tools/OSX/Scripts/pre_reload/.gitignore   | 11 +++++++++++
 .../Ubuntu/Scripts/post_initial_connection/.gitignore    | 11 +++++++++++
 managementnode/tools/Ubuntu/Scripts/post_load/.gitignore | 11 +++++++++++
 .../tools/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 +++++++++++
 .../Windows/Scripts/post_initial_connection/.gitignore   | 11 +++++++++++
 .../tools/Windows/Scripts/post_load/.gitignore           | 11 +++++++++++
 .../tools/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 +++++++++++
 managementnode/tools/Windows/Updates/x86/.gitignore      | 11 +++++++++++
 managementnode/tools/Windows/Updates/x86_64/.gitignore   | 11 +++++++++++
 managementnode/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 +++++++++++
 .../tools/Windows_10/Scripts/post_reservation/.gitignore | 11 +++++++++++
 .../tools/Windows_10/Scripts/post_reserve/.gitignore     | 11 +++++++++++
 .../tools/Windows_10/Scripts/pre_capture/.gitignore      | 11 +++++++++++
 .../tools/Windows_10/Scripts/pre_reload/.gitignore       | 11 +++++++++++
 managementnode/tools/Windows_10/Updates/.gitignore       | 11 +++++++++++
 managementnode/tools/Windows_10/Utilities/.gitignore     | 11 +++++++++++
 managementnode/tools/Windows_7/Drivers/.gitignore        | 11 +++++++++++
 .../Windows_7/Scripts/post_initial_connection/.gitignore | 11 +++++++++++
 .../tools/Windows_7/Scripts/post_load/.gitignore         | 11 +++++++++++
 .../tools/Windows_7/Scripts/post_reservation/.gitignore  | 11 +++++++++++
 .../tools/Windows_7/Scripts/post_reserve/.gitignore      | 11 +++++++++++
 .../tools/Windows_7/Scripts/pre_capture/.gitignore       | 11 +++++++++++
 .../tools/Windows_7/Scripts/pre_reload/.gitignore        | 11 +++++++++++
 managementnode/tools/Windows_7/Updates/x86/.gitignore    | 11 +++++++++++
 managementnode/tools/Windows_7/Updates/x86_64/.gitignore | 11 +++++++++++
 managementnode/tools/Windows_7/Utilities/.gitignore      | 11 +++++++++++
 managementnode/tools/Windows_8/Drivers/.gitignore        | 11 +++++++++++
 .../Windows_8/Scripts/post_initial_connection/.gitignore | 11 +++++++++++
 .../tools/Windows_8/Scripts/post_load/.gitignore         | 11 +++++++++++
 .../tools/Windows_8/Scripts/post_reservation/.gitignore  | 11 +++++++++++
 .../tools/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 +++++++++++
 managementnode/tools/Windows_8/Utilities/.gitignore      | 11 +++++++++++
 .../tools/Windows_Server_2003/Drivers/.gitignore         | 11 +++++++++++
 .../Scripts/post_initial_connection/.gitignore           | 11 +++++++++++
 .../Windows_Server_2003/Scripts/post_load/.gitignore     | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Server_2003/Scripts/post_reserve/.gitignore  | 11 +++++++++++
 .../Windows_Server_2003/Scripts/pre_capture/.gitignore   | 11 +++++++++++
 .../Windows_Server_2003/Scripts/pre_reload/.gitignore    | 11 +++++++++++
 .../tools/Windows_Server_2003/Updates/x86/.gitignore     | 11 +++++++++++
 .../tools/Windows_Server_2003/Updates/x86_64/.gitignore  | 11 +++++++++++
 .../Windows_Server_2003/Utilities/Sysprep/.gitignore     | 11 +++++++++++
 .../tools/Windows_Server_2008/Drivers/.gitignore         | 11 +++++++++++
 .../Scripts/post_initial_connection/.gitignore           | 11 +++++++++++
 .../Windows_Server_2008/Scripts/post_load/.gitignore     | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Server_2008/Scripts/post_reserve/.gitignore  | 11 +++++++++++
 .../Windows_Server_2008/Scripts/pre_capture/.gitignore   | 11 +++++++++++
 .../Windows_Server_2008/Scripts/pre_reload/.gitignore    | 11 +++++++++++
 .../tools/Windows_Server_2008/Updates/x86/.gitignore     | 11 +++++++++++
 .../tools/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 +++++++++++
 .../Windows_Server_2012/Scripts/post_load/.gitignore     | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Server_2012/Scripts/post_reserve/.gitignore  | 11 +++++++++++
 .../Windows_Server_2012/Scripts/pre_capture/.gitignore   | 11 +++++++++++
 .../Windows_Server_2012/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 +++++++++++
 .../Windows_Server_2016/Scripts/post_load/.gitignore     | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Server_2016/Scripts/post_reserve/.gitignore  | 11 +++++++++++
 .../Windows_Server_2016/Scripts/pre_capture/.gitignore   | 11 +++++++++++
 .../Windows_Server_2016/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 +++++++++++
 .../tools/Windows_Version_5/Scripts/post_load/.gitignore | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Version_5/Scripts/post_reserve/.gitignore    | 11 +++++++++++
 .../Windows_Version_5/Scripts/pre_capture/.gitignore     | 11 +++++++++++
 .../Windows_Version_5/Scripts/pre_reload/.gitignore      | 11 +++++++++++
 .../tools/Windows_Version_5/Updates/x86/.gitignore       | 11 +++++++++++
 .../tools/Windows_Version_5/Updates/x86_64/.gitignore    | 11 +++++++++++
 .../tools/Windows_Version_6/Drivers/.gitignore           | 11 +++++++++++
 .../Scripts/post_initial_connection/.gitignore           | 11 +++++++++++
 .../tools/Windows_Version_6/Scripts/post_load/.gitignore | 11 +++++++++++
 .../Scripts/post_reservation/.gitignore                  | 11 +++++++++++
 .../Windows_Version_6/Scripts/post_reserve/.gitignore    | 11 +++++++++++
 .../Windows_Version_6/Scripts/pre_capture/.gitignore     | 11 +++++++++++
 .../Windows_Version_6/Scripts/pre_reload/.gitignore      | 11 +++++++++++
 .../tools/Windows_Version_6/Updates/x86/.gitignore       | 11 +++++++++++
 .../tools/Windows_Version_6/Updates/x86_64/.gitignore    | 11 +++++++++++
 managementnode/tools/Windows_Vista/Drivers/.gitignore    | 11 +++++++++++
 .../Scripts/post_initial_connection/.gitignore           | 11 +++++++++++
 .../tools/Windows_Vista/Scripts/post_load/.gitignore     | 11 +++++++++++
 .../Windows_Vista/Scripts/post_reservation/.gitignore    | 11 +++++++++++
 .../tools/Windows_Vista/Scripts/post_reserve/.gitignore  | 11 +++++++++++
 .../tools/Windows_Vista/Scripts/pre_capture/.gitignore   | 11 +++++++++++
 .../tools/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 +++++++++++
 .../tools/Windows_XP/Scripts/post_reservation/.gitignore | 11 +++++++++++
 .../tools/Windows_XP/Scripts/post_reserve/.gitignore     | 11 +++++++++++
 .../tools/Windows_XP/Scripts/pre_capture/.gitignore      | 11 +++++++++++
 .../tools/Windows_XP/Scripts/pre_reload/.gitignore       | 11 +++++++++++
 managementnode/tools/Windows_XP/Updates/x86/.gitignore   | 11 +++++++++++
 .../tools/Windows_XP/Updates/x86_64/.gitignore           | 11 +++++++++++
 .../tools/Windows_XP/Utilities/Sysprep/.gitignore        | 11 +++++++++++
 151 files changed, 1618 insertions(+), 8 deletions(-)
----------------------------------------------------------------------