[Commits] [neo4j/enterprise] 241cb3: Added manpage for backup.

Fri Apr 13 09:56:38 CEST 2012

  Branch: refs/heads/index-base
  Home:   https://github.com/neo4j/enterprise
  Commit: 241cb32a7280945c53eb1ed964e724a3cc9d47f9
      https://github.com/neo4j/enterprise/commit/241cb32a7280945c53eb1ed964e724a3cc9d47f9
  Author: Anders Nawroth <anders at neotechnology.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    A backup/src/docs/man/neo4j-backup.1.txt
    M backup/src/docs/ops/backup.txt

  Log Message:
  -----------
  Added manpage for backup.

  Commit: c43b31058aaaa523897572756142e46ceaadeeb1
      https://github.com/neo4j/enterprise/commit/c43b31058aaaa523897572756142e46ceaadeeb1
  Author: Anders Nawroth <anders at neotechnology.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M backup/src/docs/man/neo4j-backup.1.txt

  Log Message:
  -----------
  Improved some wording after feedback.

  Commit: 93b930cdc0291a628e318723c0bb2b36a83bbd0f
      https://github.com/neo4j/enterprise/commit/93b930cdc0291a628e318723c0bb2b36a83bbd0f
  Author: Julian Simpson <simpsonjulian at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    A backup/src/docs/man/neo4j-backup.1.txt
    M backup/src/docs/ops/backup.txt

  Log Message:
  -----------
  Merge pull request #22 from nawroth/backup-manpage

Added manpage for backup

  Commit: 8ed7ed97168f5ff058bc063a93744752d94bf6ce
      https://github.com/neo4j/enterprise/commit/8ed7ed97168f5ff058bc063a93744752d94bf6ce
  Author: Anders Nawroth <anders at neotechnology.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M backup/src/docs/man/neo4j-backup.1.txt

  Log Message:
  -----------
  Fixed typo.

  Commit: ad26e00dbfa822793879747e8f11b72f2b664e53
      https://github.com/neo4j/enterprise/commit/ad26e00dbfa822793879747e8f11b72f2b664e53
  Author: Anders Nawroth <anders at nawroth.se>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M backup/src/docs/man/neo4j-backup.1.txt

  Log Message:
  -----------
  Merge pull request #23 from nawroth/backup-manpage

Fixed typo.

  Commit: a1615e74713c025bb21b00d08e02bf6786af67cb
      https://github.com/neo4j/enterprise/commit/a1615e74713c025bb21b00d08e02bf6786af67cb
  Author: Anders Nawroth <anders at neotechnology.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M backup/src/docs/man/neo4j-backup.1.txt

  Log Message:
  -----------
  Better formatting in the neo4j-backup manpage.

  Commit: 66e41a24e635a0b0b4c581c9297ed95c06c98bce
      https://github.com/neo4j/enterprise/commit/66e41a24e635a0b0b4c581c9297ed95c06c98bce
  Author: Anders Nawroth <anders at nawroth.se>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M backup/src/docs/man/neo4j-backup.1.txt

  Log Message:
  -----------
  Merge pull request #24 from nawroth/backup-manpage

Better formatting in the neo4j-backup manpage

  Commit: a2a912e8d3e80ab68c059619c1d24abca94c611f
      https://github.com/neo4j/enterprise/commit/a2a912e8d3e80ab68c059619c1d24abca94c611f
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  Prepared versions for release

  Commit: 19777fed9d49f0fb239633084cb5d4c27e6b439f
      https://github.com/neo4j/enterprise/commit/19777fed9d49f0fb239633084cb5d4c27e6b439f
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release 1.7.M02

  Commit: cb6afa30845a8156a94f14748bd9028f3970fee8
      https://github.com/neo4j/enterprise/commit/cb6afa30845a8156a94f14748bd9028f3970fee8
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 977b3c1a1df9c2f4e3723068608453014e954875
      https://github.com/neo4j/enterprise/commit/977b3c1a1df9c2f4e3723068608453014e954875
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  Back to development version .

  Commit: e632f795def4028b7a314667a57bbc13acecc4d0
      https://github.com/neo4j/enterprise/commit/e632f795def4028b7a314667a57bbc13acecc4d0
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/ResponseReceiver.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveLockManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveRelationshipTypeCreator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxHook.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperClusterClient.java

  Log Message:
  -----------
  Extracted a ClusterEventReceiver interface from the ResponseReceiver interface, having it deal with cluster events only.
Refactored around that.
(cherry picked from commit 34d29087e0514a80e47ea77ef6bbb1c52091a80d)

  Commit: 48231898a76b0e0a915974aee844614df98cb5a7
      https://github.com/neo4j/enterprise/commit/48231898a76b0e0a915974aee844614df98cb5a7
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/Broker.java
    A ha/src/main/java/org/neo4j/kernel/ha/ClusterEventReceiver.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/AbstractZooKeeperManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperClusterClient.java
    A ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java

  Log Message:
  -----------
  Added the concept of WaitMode for waitForSynchConnected() operations, allowing for a Startup mode that waits for ZK forever.
Tests that check the above, namely that on first startup the database will not fail if the ZK quorum is not yet online.
(cherry picked from commit 435e2bcd2be6088bdd779dad785ec1aa97791d4f)

  Commit: 665963f6d82b69337d532293c7d1cf93be00d154
      https://github.com/neo4j/enterprise/commit/665963f6d82b69337d532293c7d1cf93be00d154
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    R ha/src/main/java/org/neo4j/kernel/ha/ResponseReceiver.java
    A ha/src/main/java/org/neo4j/kernel/ha/SlaveDatabaseOperations.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveLockManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveRelationshipTypeCreator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxHook.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/AbstractZooKeeperManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java

  Log Message:
  -----------
  Moved WaitStrategy to AZKM and made it be returned by WaitMode - makes for easier to read code
Pushed the ResponseReceiver vs ClusterResponseReceriver separation further, made ResponseReceiver into SlaveDatabaseOperations and removed management of exceptions from the users of the class.
(cherry picked from commit 8d488975c06928b27617351af942eb3bc7a54e5a)

  Commit: 103119b9fba1324162d0567b2b2e71b6cc0efbc4
      https://github.com/neo4j/enterprise/commit/103119b9fba1324162d0567b2b2e71b6cc0efbc4
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java

  Log Message:
  -----------
  Follows changes in GraphDatabaseSPI (getGuard() added)

  Commit: a16175f44b0e664ff72bf5fa9045af03505c0471
      https://github.com/neo4j/enterprise/commit/a16175f44b0e664ff72bf5fa9045af03505c0471
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterServer.java
    M ha/src/test/java/slavetest/CommonJobs.java
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java

  Log Message:
  -----------
  After a lock timeout has been received on the client the tx.finish() in the finally block will not throw a 'Transaction already active' exception and hide the original exception

  Commit: dd25ad5ae6a79ca83cf569fa35393ce230873a69
      https://github.com/neo4j/enterprise/commit/dd25ad5ae6a79ca83cf569fa35393ce230873a69
  Author: Chris Gioran <chris.gioran at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterServer.java
    M ha/src/test/java/slavetest/CommonJobs.java
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java

  Log Message:
  -----------
  Merge pull request #25 from tinwelint/silent-tx-finish-after-lock-timeout

After a lock timeout has been received on the client the tx.finish() in the finally block will not throw a 'Transaction already active' exception and hide the original exception

  Commit: e963bc93956331d6b3b3eac54e8007e159befa6c
      https://github.com/neo4j/enterprise/commit/e963bc93956331d6b3b3eac54e8007e159befa6c
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 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
    A backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java
    M backup/src/main/java/org/neo4j/backup/RebuildFromLogs.java
    M backup/src/main/java/org/neo4j/backup/VerificationLevel.java
    M backup/src/test/java/org/neo4j/backup/EmbeddedServer.java
    M backup/src/test/java/org/neo4j/backup/ServerProcess.java
    M backup/src/test/java/org/neo4j/backup/TestBackup.java
    M backup/src/test/java/org/neo4j/backup/TestBackupToolEmbedded.java
    M backup/src/test/java/org/neo4j/backup/TestConfiguration.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/main/java/org/neo4j/kernel/BranchedStoreBean.java
    A ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractHAGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/Broker.java
    M ha/src/main/java/org/neo4j/kernel/ha/EnterpriseConfigurationMigrator.java
    A ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterIdGeneratorFactory.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxHook.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/BranchDetectingTxVerifier.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java
    M ha/src/test/java/org/neo4j/ha/Neo4jHaCluster.java
    M ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
    M ha/src/test/java/org/neo4j/ha/TestClientThreadIsolation.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java
    M ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
    M ha/src/test/java/org/neo4j/kernel/ha/EnterpriseConfigurationMigratorTest.java
    M ha/src/test/java/org/neo4j/kernel/ha/FakeMasterBroker.java
    M ha/src/test/java/org/neo4j/kernel/ha/FakeSlaveBroker.java
    M ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java
    M ha/src/test/java/org/neo4j/test/ha/StandaloneDatabase.java
    M ha/src/test/java/recovery/TestDoubleRecovery.java
    M ha/src/test/java/slavetest/CommonJobs.java
    M ha/src/test/java/slavetest/Job.java
    M ha/src/test/java/slavetest/SingleJvmTest.java
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java
    M ha/src/test/java/slavetest/StartHaDb.java
    M ha/src/test/java/slavetest/TestClusterNames.java
    M ha/src/test/java/slavetest/TestMaster.java
    M ha/src/test/java/slavetest/TestStoreCopy.java
    M ha/src/test/java/slavetest/manual/ManualTest1.java
    M ha/src/test/java/slavetest/manual/ManualTest2.java
    M server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServerBootstrapper.java
    M server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerTestUtils.java

  Log Message:
  -----------
  Created *Settings classes for all extensions
Allow KernelExtensions to specify settings-class
Added size and duration accessors in Config
Use GraphDatabaseFactory and settings in as many places as possible
Added EmbeddedDatabaseRule for handling graph database during tests
Added GraphTransactionRule for handling graph transactions during tests
Updated ProcessStreamHandler to be easier to use
Removed ancient StandaloneWithShell
Updated settings to have same naming conventions

  Commit: 5c68cc82c9fae78d966dda3acc06ff64099eb79d
      https://github.com/neo4j/enterprise/commit/5c68cc82c9fae78d966dda3acc06ff64099eb79d
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterServer.java
    M ha/src/test/java/slavetest/CommonJobs.java
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'neo4j/master'

Conflicts:
	ha/src/test/java/slavetest/SingleJvmWithNettyTest.java

  Commit: 9109bbcc490e1aa672bbc8b193073afd568c0641
      https://github.com/neo4j/enterprise/commit/9109bbcc490e1aa672bbc8b193073afd568c0641
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M backup/src/main/java/org/neo4j/backup/OnlineBackup.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/test/java/slavetest/CommonJobs.java

  Log Message:
  -----------
  Reverted IndexProvider back to abstract class
Fixes to make it compile

  Commit: 956aeca7234f23c85cfdf90dee46ea9b96a7ab59
      https://github.com/neo4j/enterprise/commit/956aeca7234f23c85cfdf90dee46ea9b96a7ab59
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java

  Log Message:
  -----------
  Removed star imports

  Commit: f5cc469a090a48f582a93159967ca11def749c12
      https://github.com/neo4j/enterprise/commit/f5cc469a090a48f582a93159967ca11def749c12
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.java
    M ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java

  Log Message:
  -----------
  Correct license headers

  Commit: 4b3443a98351f21dd5ff3497db0d8f1a8158492a
      https://github.com/neo4j/enterprise/commit/4b3443a98351f21dd5ff3497db0d8f1a8158492a
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M backup/src/main/java/org/neo4j/backup/OnlineBackup.java
    M backup/src/main/java/org/neo4j/backup/OnlineBackupExtension.java
    M backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java
    M backup/src/test/java/org/neo4j/backup/TestBackup.java
    M backup/src/test/java/org/neo4j/backup/TestBackupToolEmbedded.java
    M ha/src/main/java/org/neo4j/kernel/BranchedStoreBean.java
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.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/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/test/java/org/neo4j/kernel/ha/FakeMasterBroker.java
    M ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java
    M ha/src/test/java/recovery/TestDoubleRecovery.java
    M ha/src/test/java/slavetest/SingleJvmTest.java
    M ha/src/test/java/slavetest/TestClusterNames.java

  Log Message:
  -----------
  Community advanced and enterprise now builds properly

  Commit: 721035a736393efc1885e9148557b90afa4d63a9
      https://github.com/neo4j/enterprise/commit/721035a736393efc1885e9148557b90afa4d63a9
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.java
    M ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/neo4j/enterprise

  Commit: 38e5d27afc0d68cec46ddc3898c8e62294a4a37c
      https://github.com/neo4j/enterprise/commit/38e5d27afc0d68cec46ddc3898c8e62294a4a37c
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-03-30 (Fri, 30 Mar 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:
  -----------
  Uses ability to reuse gcr caches between sessions for between internal restarts to reduce the strain on GC

  Commit: 917a04a89b2cedcbc3a70556ef57f43ef13dd9bf
      https://github.com/neo4j/enterprise/commit/917a04a89b2cedcbc3a70556ef57f43ef13dd9bf
  Author: Rickard Öberg <rickardoberg at gmail.com>
  Date:   2012-04-02 (Mon, 02 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:
  -----------
  Now loads System properties as part of configuration
Logging is now its own service, with classic and logback as implementations
Move over HA and UDC to use new config style as much as possible

  Commit: 3ed504227f8bf8e1961003b273374cd8472638f6
      https://github.com/neo4j/enterprise/commit/3ed504227f8bf8e1961003b273374cd8472638f6
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Skip streaming transactions as updates back to the originating slave

  Commit: 0436c4178dd92291731e5bf73511e92e3b3207db
      https://github.com/neo4j/enterprise/commit/0436c4178dd92291731e5bf73511e92e3b3207db
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java

  Log Message:
  -----------
  Logical log version is retrieved from the sandbox directory as it should.

  Commit: 0be9bb1b9bce68c5295cf43d408cdb8d1bca0229
      https://github.com/neo4j/enterprise/commit/0be9bb1b9bce68c5295cf43d408cdb8d1bca0229
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Added a comment explaining the improved predicate

  Commit: a72063cb67a48f8695405a644423c036dc21bcbf
      https://github.com/neo4j/enterprise/commit/a72063cb67a48f8695405a644423c036dc21bcbf
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/Broker.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java

  Log Message:
  -----------
  Now storeId can wait infinitely for ZK making start-no-wait work with existing stores

  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...

  Commit: 2e2ac013e41117431b19b58298c0d56587356067
      https://github.com/neo4j/enterprise/commit/2e2ac013e41117431b19b58298c0d56587356067
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Merge pull request #27 from digitalstain/skip-same-slave-tx

Skip streaming transactions as updates back to the originating slave

  Commit: 2705c7f613352becc532c5101009da073230b3e6
      https://github.com/neo4j/enterprise/commit/2705c7f613352becc532c5101009da073230b3e6
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java

  Log Message:
  -----------
  Merge pull request #28 from digitalstain/correct-sandbox-copy

Logical log version is retrieved from the sandbox directory as it should.

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

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java

  Log Message:
  -----------
  Fixed some imports

  Commit: b3ef9e59694bc0165a6d4abdb9f94afd15609a96
      https://github.com/neo4j/enterprise/commit/b3ef9e59694bc0165a6d4abdb9f94afd15609a96
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/MasterUtil.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/MasterImpl.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 branch 'master' into wait-for-store-id

  Commit: b9c8d7e34676f2c2df962e8c6da3e44b4fd8c449
      https://github.com/neo4j/enterprise/commit/b9c8d7e34676f2c2df962e8c6da3e44b4fd8c449
  Author: Chris Gioran <chris.gioran 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/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/Broker.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java

  Log Message:
  -----------
  Merge pull request #29 from digitalstain/wait-for-store-id

MP ok'ed. Self merging because had to resolve conflict.

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

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.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/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCache.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java
    A ha/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java
    A ha/src/test/java/org/neo4j/kernel/ha/HaCaches.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestCacheObjectReuse.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGCResistantCache.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGcrCacheRemoveSizeDiverge.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestSizeOf.java
    M ha/src/test/java/slavetest/SingleJvmTest.java

  Log Message:
  -----------
  Moved GC resistent cache to enterprise and made cache implementations pluggable via Service loader

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

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java

  Log Message:
  -----------
  Follows name change of config parameter

  Commit: b8cb4012d88c3ac6967d82a934f45c8d1fd81348
      https://github.com/neo4j/enterprise/commit/b8cb4012d88c3ac6967d82a934f45c8d1fd81348
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Revert "Added a comment explaining the improved predicate"

This reverts commit 0be9bb1b9bce68c5295cf43d408cdb8d1bca0229.

  Commit: 9a67df6b23348984be8461303937ea57cb6d301a
      https://github.com/neo4j/enterprise/commit/9a67df6b23348984be8461303937ea57cb6d301a
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Revert "Skip streaming transactions as updates back to the originating slave"

This reverts commit 3ed504227f8bf8e1961003b273374cd8472638f6.

  Commit: c5dbc8fd8f24bea06d601db75a87d32affacec4b
      https://github.com/neo4j/enterprise/commit/c5dbc8fd8f24bea06d601db75a87d32affacec4b
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 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/RebuildFromLogs.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  * Removed generic Predicate filter in getTransactionStreamForDataSource because
  the use of it could be replaced with the use of endTxId. Also it introduced confusion.
* Uses filter in XaLogicalLog#applyCommittedTransaction for not applying transactions
  received from master which were created be myself (can happen in some race condition).

  Commit: 760e727491d42212e52f006a1d2fee6dc0d1a3d3
      https://github.com/neo4j/enterprise/commit/760e727491d42212e52f006a1d2fee6dc0d1a3d3
  Author: johan-neo <johan at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.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/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCache.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java
    A ha/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java
    A ha/src/test/java/org/neo4j/kernel/ha/HaCaches.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestCacheObjectReuse.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGCResistantCache.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGcrCacheRemoveSizeDiverge.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestSizeOf.java
    M ha/src/test/java/slavetest/SingleJvmTest.java

  Log Message:
  -----------
  Merge pull request #30 from tinwelint/gcr-in-enterprise-as-service

Moved GC resistent cache to enterprise and made cache implementations

  Commit: 41b38b3dd08afec419eaed6840d6dc88c052fda5
      https://github.com/neo4j/enterprise/commit/41b38b3dd08afec419eaed6840d6dc88c052fda5
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.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/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCache.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java
    A ha/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java
    A ha/src/test/java/org/neo4j/kernel/ha/HaCaches.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestCacheObjectReuse.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGCResistantCache.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGcrCacheRemoveSizeDiverge.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestSizeOf.java
    M ha/src/test/java/slavetest/SingleJvmTest.java

  Log Message:
  -----------
  Merge branch 'master' into dont-apply-txs-by-me

  Commit: b86874b474094306646c52faa1280e91ca3ca87b
      https://github.com/neo4j/enterprise/commit/b86874b474094306646c52faa1280e91ca3ca87b
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A ha/src/main/java/org/neo4j/kernel/ha/HaCaches.java
    R ha/src/test/java/org/neo4j/kernel/ha/HaCaches.java

  Log Message:
  -----------
  Moved from test to main (don't know how it got there

  Commit: fcb07bb85aa4a47297e7011c257157b079d89aa9
      https://github.com/neo4j/enterprise/commit/fcb07bb85aa4a47297e7011c257157b079d89aa9
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A ha/src/main/java/org/neo4j/kernel/ha/HaCaches.java
    R ha/src/test/java/org/neo4j/kernel/ha/HaCaches.java

  Log Message:
  -----------
  Merge branch 'master' into dont-apply-txs-by-me

  Commit: 6a4628ca6b43d91a27c8658ca190487554c7702d
      https://github.com/neo4j/enterprise/commit/6a4628ca6b43d91a27c8658ca190487554c7702d
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 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/RebuildFromLogs.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Merge pull request #31 from tinwelint/dont-apply-txs-by-me

Dont apply txs by me, goes with a0f32380c1fefe343558425630e9d735b4b7e6d3

  Commit: 5efdcd3dca865547545ac02896b16b1860f07bc4
      https://github.com/neo4j/enterprise/commit/5efdcd3dca865547545ac02896b16b1860f07bc4
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-04 (Wed, 04 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/RebuildFromLogs.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java

  Log Message:
  -----------
  Revert "* Removed generic Predicate filter in getTransactionStreamForDataSource because"

This reverts commit c5dbc8fd8f24bea06d601db75a87d32affacec4b.

  Commit: 89517492bffc4c7fd5b73e9dde378c4c6a648f36
      https://github.com/neo4j/enterprise/commit/89517492bffc4c7fd5b73e9dde378c4c6a648f36
  Author: Jacob Hansson <jacob at voltvoodoo.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java

  Log Message:
  -----------
  Renamed an incorrectly named test.

  Commit: ce447d29199a390d7a6d3ebb5922839a13dfe898
      https://github.com/neo4j/enterprise/commit/ce447d29199a390d7a6d3ebb5922839a13dfe898
  Author: Jacob Hansson <jacob at voltvoodoo.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java

  Log Message:
  -----------
  Added a nullcheck to not pollute failures with extra stack traces.

  Commit: b93cdb93e130b8cbd176ec1041ebbf3056402497
      https://github.com/neo4j/enterprise/commit/b93cdb93e130b8cbd176ec1041ebbf3056402497
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java

  Log Message:
  -----------
  Close the message logger so that the file is closed on windows

  Commit: 8df755b0a0f107c30b7e44ff0702cc3ab2458cf2
      https://github.com/neo4j/enterprise/commit/8df755b0a0f107c30b7e44ff0702cc3ab2458cf2
  Author: Jacob Hansson <jacob at voltvoodoo.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java

  Log Message:
  -----------
  Added spacing ftw

  Commit: 25ea0651b5a4a19822c263b01e4b6ec2a3feed34
      https://github.com/neo4j/enterprise/commit/25ea0651b5a4a19822c263b01e4b6ec2a3feed34
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java

  Log Message:
  -----------
  Merge pull request #33 from jakewins/minor-habackup-testfix

Minor habackup testfix

  Commit: e11a5cf30ddc05ccdd18827106f2342bfa6069ee
      https://github.com/neo4j/enterprise/commit/e11a5cf30ddc05ccdd18827106f2342bfa6069ee
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-10 (Tue, 10 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

  Log Message:
  -----------
  Fixed a problem where a held Index reference wouldn't be updated to work after an internal restart, due to StoreId not being present at the moment of equality check

  Commit: 1d98ffe48ce6bc7905c51e0df34c1e2ae9636952
      https://github.com/neo4j/enterprise/commit/1d98ffe48ce6bc7905c51e0df34c1e2ae9636952
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/BranchedStoreBean.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java

  Log Message:
  -----------
  Branched data directories end up in <storeDir>/branched/ sub directory

  Commit: 9289de854a83ef984e6be06d5ad8f7fe18ece8a0
      https://github.com/neo4j/enterprise/commit/9289de854a83ef984e6be06d5ad8f7fe18ece8a0
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    A ha/src/test/java/org/neo4j/ha/TestBranchedData.java

  Log Message:
  -----------
  Test for migrating branched data directories to the new place

  Commit: 414f42593c93a5b6302bdf9855d2ee034096591a
      https://github.com/neo4j/enterprise/commit/414f42593c93a5b6302bdf9855d2ee034096591a
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  Prepared versions for release

  Commit: 6287b312462a04bd07dd5d1db828868b0e6bb3b9
      https://github.com/neo4j/enterprise/commit/6287b312462a04bd07dd5d1db828868b0e6bb3b9
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release 1.7.M03

  Commit: 92e229e0fe0988e0ae3bc82cc2b5934d91155496
      https://github.com/neo4j/enterprise/commit/92e229e0fe0988e0ae3bc82cc2b5934d91155496
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: fd337c759a4d29bfb1ba343fbe5ca1b13c016768
      https://github.com/neo4j/enterprise/commit/fd337c759a4d29bfb1ba343fbe5ca1b13c016768
  Author: Neo4j build server <buildserver at neotechnology.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M backup/pom.xml
    M com/pom.xml
    M ha/pom.xml
    M neo4j-enterprise/pom.xml
    M server-enterprise/pom.xml

  Log Message:
  -----------
  Back to development version .

  Commit: 203ee7cd8e13c4e8df7b144d2069b394ebbcdf93
      https://github.com/neo4j/enterprise/commit/203ee7cd8e13c4e8df7b144d2069b394ebbcdf93
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M ha/src/test/java/org/neo4j/test/ha/LocalhostZooKeeperCluster.java

  Log Message:
  -----------
  Increased number of client connections

  Commit: d5989b4bd8a26d483efdfa6b38c86e5a720310d3
      https://github.com/neo4j/enterprise/commit/d5989b4bd8a26d483efdfa6b38c86e5a720310d3
  Author: Chris Gioran <chris.gioran at neotechnology.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/BranchedStoreBean.java
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
    A ha/src/test/java/org/neo4j/ha/TestBranchedData.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java

  Log Message:
  -----------
  Merge pull request #34 from tinwelint/branches-in-dir

Branched data goes in under root directory

  Commit: 1613ea5e560c28cd8ae1a9f3dc73c76fdb454abc
      https://github.com/neo4j/enterprise/commit/1613ea5e560c28cd8ae1a9f3dc73c76fdb454abc
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java

  Log Message:
  -----------
  Uses FileUtils.moveFile for moving to branched directory (since it could be on another disk)

  Commit: 2ca4530e85f718eeb674506698b288f7353f89fc
      https://github.com/neo4j/enterprise/commit/2ca4530e85f718eeb674506698b288f7353f89fc
  Author: Mattias Persson <mattias at neotechnology.com>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    A backup/src/docs/man/neo4j-backup.1.txt
    M backup/src/docs/ops/backup.txt
    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
    A backup/src/main/java/org/neo4j/backup/OnlineBackupSettings.java
    M backup/src/main/java/org/neo4j/backup/RebuildFromLogs.java
    M backup/src/main/java/org/neo4j/backup/VerificationLevel.java
    M backup/src/test/java/org/neo4j/backup/EmbeddedServer.java
    M backup/src/test/java/org/neo4j/backup/ServerProcess.java
    M backup/src/test/java/org/neo4j/backup/TestBackup.java
    M backup/src/test/java/org/neo4j/backup/TestBackupToolEmbedded.java
    M backup/src/test/java/org/neo4j/backup/TestConfiguration.java
    M com/src/main/java/org/neo4j/com/MasterUtil.java
    M com/src/main/java/org/neo4j/com/Server.java
    M ha/src/main/java/org/neo4j/kernel/BranchedStoreBean.java
    A ha/src/main/java/org/neo4j/kernel/EnterpriseGraphDatabaseFactory.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/AbstractBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/AbstractHAGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/Broker.java
    A ha/src/main/java/org/neo4j/kernel/ha/ClusterEventReceiver.java
    M ha/src/main/java/org/neo4j/kernel/ha/EnterpriseConfigurationMigrator.java
    A ha/src/main/java/org/neo4j/kernel/ha/HaCaches.java
    A ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterIdGeneratorFactory.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterImpl.java
    M ha/src/main/java/org/neo4j/kernel/ha/MasterServer.java
    R ha/src/main/java/org/neo4j/kernel/ha/ResponseReceiver.java
    A ha/src/main/java/org/neo4j/kernel/ha/SlaveDatabaseOperations.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveGraphDatabase.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveLockManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveRelationshipTypeCreator.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxHook.java
    M ha/src/main/java/org/neo4j/kernel/ha/SlaveTxIdGenerator.java
    M ha/src/main/java/org/neo4j/kernel/ha/backup/HaBackupProvider.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/AbstractZooKeeperManager.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/BranchDetectingTxVerifier.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooClient.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperBroker.java
    M ha/src/main/java/org/neo4j/kernel/ha/zookeeper/ZooKeeperClusterClient.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCache.java
    A ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java
    A ha/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider
    M ha/src/test/java/org/neo4j/ha/Neo4jHaCluster.java
    M ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java
    M ha/src/test/java/org/neo4j/ha/TestBackupToolHa.java
    A ha/src/test/java/org/neo4j/ha/TestBranchedData.java
    M ha/src/test/java/org/neo4j/ha/TestClientThreadIsolation.java
    M ha/src/test/java/org/neo4j/ha/TestConfig.java
    M ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
    M ha/src/test/java/org/neo4j/kernel/ha/EnterpriseConfigurationMigratorTest.java
    M ha/src/test/java/org/neo4j/kernel/ha/FakeMasterBroker.java
    M ha/src/test/java/org/neo4j/kernel/ha/FakeSlaveBroker.java
    A ha/src/test/java/org/neo4j/kernel/ha/zookeeper/TestZooClient.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestCacheObjectReuse.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGCResistantCache.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestGcrCacheRemoveSizeDiverge.java
    A ha/src/test/java/org/neo4j/kernel/impl/cache/TestSizeOf.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/recovery/TestDoubleRecovery.java
    M ha/src/test/java/slavetest/AbstractHaTest.java
    M ha/src/test/java/slavetest/CommonJobs.java
    M ha/src/test/java/slavetest/DumpZooInfo.java
    M ha/src/test/java/slavetest/Job.java
    M ha/src/test/java/slavetest/SingleJvmTest.java
    M ha/src/test/java/slavetest/SingleJvmWithNettyTest.java
    M ha/src/test/java/slavetest/StartHaDb.java
    M ha/src/test/java/slavetest/TestClusterNames.java
    M ha/src/test/java/slavetest/TestMaster.java
    M ha/src/test/java/slavetest/TestStoreCopy.java
    M ha/src/test/java/slavetest/manual/ManualTest1.java
    M ha/src/test/java/slavetest/manual/ManualTest2.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/EnterpriseNeoServerBootstrapper.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/ServerTestUtils.java
    M server-enterprise/src/test/java/org/neo4j/server/enterprise/TestHaDatabaseWithRrd.java

  Log Message:
  -----------
  Merge branch 'master' into index-base

Conflicts:
	backup/src/test/java/org/neo4j/backup/TestBackup.java

Compare: https://github.com/neo4j/enterprise/compare/1fd5c9d...2ca4530