ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject git commit: AMBARI-6422. Failing ambari-server tests on trunk (dlysnichenko)
Date Wed, 09 Jul 2014 11:44:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 4a2498ea3 -> 5bb59403f


AMBARI-6422. Failing ambari-server tests on trunk (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: 5bb59403fea8de54690f6f19a30df5462c99f784
Parents: 4a2498e
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Tue Jul 8 20:22:49 2014 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Wed Jul 9 14:43:23 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java   | 2 ++
 .../apache/ambari/server/api/util/StackExtensionHelperTest.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5bb59403/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 50087e5..d75ef85 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -71,6 +71,8 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog {
       String.class, 255, null, true));
     dbAccessor.addColumn("viewparameter", new DBAccessor.DBColumnInfo("masked",
       Character.class, 1, null, true));
+    dbAccessor.addColumn("users", new DBAccessor.DBColumnInfo("active",
+      Integer.class, 1, 1, false));    
   }
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5bb59403/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
index 6456860..79745bb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
@@ -77,7 +77,7 @@ public class StackExtensionHelperTest {
         assertEquals("MASTER", components.get(0).getCategory());
         List<PropertyInfo> properties = serviceInfo.getProperties();
         // Check some property
-        assertEquals(38, properties.size());
+        assertEquals(37, properties.size());
         boolean found = false;
         for (PropertyInfo property : properties) {
           if (property.getName().equals("javax.jdo.option.ConnectionDriverName")) {


Mime
View raw message