modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit b3866debd52593cce9f9bf10bd17df8e3b3da0bc Author: John Mazzitelli mazz@redhat.com Date: Fri May 25 14:24:37 2012 -0400
[BZ 825318] fix a problem with conflicts during the cherry pick
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java index d5ad66b..0c5d769 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java @@ -159,7 +159,7 @@ public class LargeGroupCriteriaTest extends LargeGroupTestBase { env = new ArrayList<LargeGroupEnvironment>(1);
LargeGroupEnvironment lgeWithTypes = null; - env.add(createLargeGroupWithNormalUserRoleAccessWithInventoryStatus(lgeWithTypes, gac.total, gac.down, + env.add(createLargeGroupWithNormalUserRoleAccess(lgeWithTypes, gac.total, gac.down, gac.unknown, gac.disabled, Permission.CONFIGURE_READ));
ResourceGroupCriteria criteria;