Permalink
Switch branches/tags
Commits on Feb 7, 2012
Commits on Feb 5, 2012
  1. Revert "[maven-release-plugin] prepare release 1.5.1"

    tinwelint committed Feb 5, 2012
    This reverts commit 6290e4e.
  2. Uses a combination of Xid and masterId/myId as checksum instead of ju…

    tinwelint committed Feb 5, 2012
    …st timeWritten to make a transaction start record truely unique. This will allow for better branch detection
    
    (cherry picked from commit 4489cf7)
  3. Fixed an issue where the JVM would crash between the .active logical …

    tinwelint committed with thobe Dec 7, 2011
    …log state was set to CLEAN
    
    and the current log file (.1/.2) was renamed/removed. The next startup that rename would
    be done instead, but there the log version wouldn't be incremented and the next log would have
    the same log version header as the previous one, which would break when trying to rename it
    since that file already existed.
    
    a rotate or close (with keep_logical_logs=true) it would try to rename that file
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
Commits on Feb 4, 2012
  1. Fixed an issue where the master cached the wrong masterId for transac…

    thobe committed Feb 4, 2012
    …tions.
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
    	kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java
Commits on Feb 2, 2012
  1. Ok, now it creates good toStrings

    tinwelint committed Feb 2, 2012
    (cherry picked from commit 4cc35ad)
  2. Exposes convenient methods for getting the bits for primitive numbers…

    tinwelint committed Feb 2, 2012
    … as string
    
    (cherry picked from commit bd18c3c)
Commits on Feb 1, 2012
  1. Updated changelogs

    digitalstain committed Feb 1, 2012
  2. Fixed an issue during rotation where transactions that started before…

    tinwelint committed Jan 31, 2012
    … (i.e. had its start/commands)
    
    the first active transaction would be ignored when copying over active transactions to the new log.
    Now it pulls in any START/COMMAND records for such transactions right before the COMMIT/DONE record.
    (cherry picked from commit 993fb28)
  3. Found and fixed a data race issue between threads removing the same p…

    thobe committed Feb 1, 2012
    …roperty while the node is evicted from cache.
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeImpl.java
    	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
    	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java
    	kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java
Commits on Jan 31, 2012
  1. copyright to 2012 update

    peterneubauer committed Jan 31, 2012
Commits on Jan 30, 2012
  1. Added a test case for creating a property with an empty string as key

    digitalstain committed Jan 30, 2012
    Removed assertions that made the test fail
  2. refactor: use constructor/final instead of setup()

    tbaum committed with digitalstain Jan 9, 2012
    Conflicts:
    
    	server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletResponse.java
  3. Test case and fix for a property cache poisoning bug.

    thobe committed Jan 30, 2012
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/core/ArrayBasedPrimitive.java
Commits on Jan 29, 2012
  1. Cleanup of backported fixes.

    thobe committed Jan 29, 2012
  2. Fixed a leak of stale versions of the properties array in Primitive.

    thobe committed Jan 29, 2012
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/core/ArrayBasedPrimitive.java
  3. All modified property records now have a reference to their owning No…

    thobe committed Jan 29, 2012
    …de or Relationship in the log.
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/NodeRecord.java
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/PrimitiveRecord.java
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/PropertyIndexData.java
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/WriteTransaction.java
  4. Better exception messages when records are not found.

    thobe committed Jan 29, 2012
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/AbstractNameStore.java
  5. Fixed a bug where properties of a deleted node/relationship were not …

    thobe committed Jan 27, 2012
    …deleted properly.
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/helpers/Args.java
    	kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/WriteTransaction.java
    	kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestPropertyBlocks.java
Commits on Jan 28, 2012
  1. Exposed kernel panic generator

    tinwelint committed Jan 27, 2012
    (cherry picked from commit 692d80e)
    
    Conflicts:
    
    	kernel/src/main/java/org/neo4j/kernel/Config.java
  2. Fixed a problem where copying over active transactions to the new log…

    tinwelint committed Jan 28, 2012
    … (when rotating) would accidentally mark all copied transactions as active again, by putting them into xidIdentMap. This would completely mess up the next rotation in that virtually all transactions would have to be copied, filling the new log immediately. Fixed by only putting in xidIdentMap if it already was active
    
    (cherry picked from commit bbd4318)