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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java

@@ -631,10 +631,10 @@
      + "objectClass: top\n"
      + "objectClass: ds-cfg-synchronization-provider-config\n"
      + "cn: example\n"
      + "ds-cfg-synchronization-dn: dc=example,dc=com\n"
      + "ds-cfg-base-dn: dc=example,dc=com\n"
      + "ds-cfg-changelog-server: localhost:"
      + getChangelogPort(changelogID)+"\n"
      + "ds-cfg-directory-server-id: " + server1ID + "\n"
      + "ds-cfg-server-id: " + server1ID + "\n"
      + "ds-cfg-receive-status: true\n"
//    + "ds-cfg-heartbeat-interval: 0 ms\n"
      + "ds-cfg-window-size: " + WINDOW_SIZE;