[Commits] [neo4j/enterprise] af7390: Merge branch 'master' into reuse-gcr-cache-instanc...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/neo4j/enterprise
  Commit: af7390bd3d33fb5f1a594ea7274c09cc9a2ec579
      https://github.com/neo4j/enterprise/commit/af7390bd3d33fb5f1a594ea7274c09cc9a2ec579
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M backup/src/main/java/org/neo4j/backup/BackupImpl.java
  M backup/src/main/java/org/neo4j/backup/OnlineBackup.java
  M backup/src/main/java/org/neo4j/backup/OnlineBackupExtension.java
  M backup/src/test/java/org/neo4j/backup/TestBackupToolEmbedded.java
  M ha/src/main/java/org/neo4j/kernel/HaConfig.java
  M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/AbstractHAGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/backup/HaBackupProvider.java
  M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
  M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperClusterClient.java
  M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
  M ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java
  M ha/src/test/java/org/neo4j/test/ha/LocalhostZooKeeperCluster.java
  M ha/src/test/java/org/neo4j/test/ha/StandaloneDatabase.java
  M ha/src/test/java/slavetest/AbstractHaTest.java
  M ha/src/test/java/slavetest/DumpZooInfo.java
  M ha/src/test/java/slavetest/SingleJvmTest.java
  M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java
  M ha/src/test/java/slavetest/TestClusterNames.java
  M server-enterprise/src/functionaltest/java/org/neo4j/server/enterprise/HaServerFunctionalTest.java
  M server-enterprise/src/functionaltest/java/org/neo4j/test/server/ha/ServerCluster.java
  M server-enterprise/src/main/java/org/neo4j/server/enterprise/Neo4jHAPropertiesMustExistRule.java
  M server-enterprise/src/test/java/org/neo4j/server/enterprise/Neo4jHAPropertiesMustExistRuleTest.java
  M server-enterprise/src/test/java/org/neo4j/server/enterprise/TestHaDatabaseWithRrd.java

  Log Message:
  -----------
  Merge branch 'master' into reuse-gcr-cache-instances

Conflicts:
	ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
	ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
	ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java


  Commit: 794ff4fdc44e5514540d37e8581aecc649fcfd15
      https://github.com/neo4j/enterprise/commit/794ff4fdc44e5514540d37e8581aecc649fcfd15
  Author: johan-neo <johan at neotechnology.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/AbstractHAGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
  M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
  M ha/src/test/java/org/neo4j/ha/TestConfig.java
  M ha/src/test/java/slavetest/TestClusterNames.java

  Log Message:
  -----------
  Merge pull request #26 from tinwelint/reuse-gcr-cache-instances

Uses ability to reuse gcr caches between sessions for between internal...


Compare: https://github.com/neo4j/enterprise/compare/917a04a...794ff4f