[40/50] [abbrv] merge compiles

[ah...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 3a55751..db8a088 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -156,6 +156,7 @@ DROP TABLE IF EXISTS `cloud`.`autoscale_vmprofiles`;
 DROP TABLE IF EXISTS `cloud`.`autoscale_policies`;
 DROP TABLE IF EXISTS `cloud`.`counter`;
 DROP TABLE IF EXISTS `cloud`.`conditions`;
+DROP TABLE IF EXISTS `cloud`.`inline_load_balancer_nic_map`;
 
 CREATE TABLE `cloud`.`version` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/utils/src/com/cloud/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/StringUtils.java b/utils/src/com/cloud/utils/StringUtils.java
index e840310..8f0a503 100644
--- a/utils/src/com/cloud/utils/StringUtils.java
+++ b/utils/src/com/cloud/utils/StringUtils.java
@@ -16,7 +16,7 @@
 // under the License.
 package com.cloud.utils;
 
-import static java.util.Arrays.*;
+import static java.util.Arrays.asList;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -151,4 +151,17 @@ public class StringUtils {
     }
 
 
+    public static int formatForOutput(String text, int start, int columns, char separator) {
+        if (start >= text.length()) {
+            return -1;
+        }
+
+        int end = start + columns;
+        if (end > text.length()) {
+            end = text.length();
+        }
+        String searchable = text.substring(start, end);
+        int found = searchable.lastIndexOf(separator);
+        return found > 0 ? found :  end - start;
+    }
 }