Repository: ambari Updated Branches: refs/heads/trunk 0f79b23bc -> 77d613663
AMBARI-6635. Fix upgrade to respect -env (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77d61366 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77d61366 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77d61366 Branch: refs/heads/trunk Commit: 77d613663fc85e017ea380c7f7c1f2681df5a62a Parents: 0f79b23 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Tue Jul 29 23:25:01 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Tue Jul 29 23:25:01 2014 +0300 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java | 2 +- .../org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/77d61366/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java index 328dfff..1b2526c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java @@ -89,7 +89,7 @@ public class UpgradeCatalog160Test { DBAccessor dbAccessor = createNiceMock(DBAccessor.class); Method m = AbstractUpgradeCatalog.class.getDeclaredMethod - ("updateConfigurationProperties", String.class, Map.class, boolean.class); + ("updateConfigurationProperties", String.class, Map.class, boolean.class, boolean.class); UpgradeCatalog160 upgradeCatalog = createMockBuilder(UpgradeCatalog160.class) .addMockedMethod(m).createMock(); http://git-wip-us.apache.org/repos/asf/ambari/blob/77d61366/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java index 2942c7a..330b7b3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java @@ -124,7 +124,7 @@ public class UpgradeCatalog161Test { TypedQuery query = createMock(TypedQuery.class); Method m = AbstractUpgradeCatalog.class.getDeclaredMethod - ("updateConfigurationProperties", String.class, Map.class, boolean.class); + ("updateConfigurationProperties", String.class, Map.class, boolean.class, boolean.class); UpgradeCatalog161 upgradeCatalog = createMockBuilder(UpgradeCatalog161.class) .addMockedMethod(m).createMock();
