Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java

@@ -73,8 +73,8 @@
      "objectClass: ds-cfg-entry-cache",
      "objectClass: top",
      "cn: Entry Cache",
      "ds-cfg-entry-cache-class: org.opends.server.extensions.FIFOEntryCache",
      "ds-cfg-entry-cache-enabled: true",
      "ds-cfg-java-class: org.opends.server.extensions.FIFOEntryCache",
      "ds-cfg-enabled: true",
      "ds-cfg-max-entries: " + Integer.toString(super.MAXENTRIES));
    super.configuration = AdminTestCaseUtils.getConfiguration(
      EntryCacheCfgDefn.getInstance(), cacheConfigEntry);