From 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 04:10:04 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
server/lib/classes/openvz_tools.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/openvz_tools.inc.php b/server/lib/classes/openvz_tools.inc.php
index 403613c..16dc601 100644
--- a/server/lib/classes/openvz_tools.inc.php
+++ b/server/lib/classes/openvz_tools.inc.php
@@ -31,6 +31,8 @@
/**
* Checks, if the server ist a OpenVZ - Host
*/
+
+
public function isOpenVzHost() {
/*
* if there is a "/proc/user_beanconters" we have OpenVz "in use"
@@ -109,7 +111,7 @@
$item = trim($item);
/*
- * Now get every token and insert it to the array
+ * Now get every token and insert it to the array
*/
if ($item != '') {
$tmp = explode(' ', $item);
@@ -145,5 +147,7 @@
/* ready */
return $res;
}
+
}
-?>
\ No newline at end of file
+
+?>
--
Gitblit v1.9.1