Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 30, 2015
  1. @benbc

    Retire master branch.

    benbc authored
  2. @alexaverbuch

    Merge pull request #4311 from tinwelint/2.2-CharReadable-charset

    alexaverbuch authored
    Ability to specify input encoding in import tool
  3. @systay

    Merge pull request #4292 from boggle/2.2-cleanup

    systay authored
    Cypher related minor cleanup
  4. @systay

    Merge pull request #4305 from davidegrohmann/2.2-fix-input-pos-after-…

    systay authored
    …preparse
    
    Fix input position in syntax and semantic exceptions
  5. @systay

    Merge pull request #4297 from cleishm/cypher-versions-2.2

    systay authored
    Update 2.1 Cypher Compiler to 2.1.7
Commits on Mar 29, 2015
  1. @tinwelint

    Merge pull request #4310 from tinwelint/2.2-bip-prop-enc-aioob

    tinwelint authored
    Fixes an issues with growing property block array in property encoder step
  2. Merge branch '2.1-maint'

    Chris Gioran authored
  3. Merge branch '2.0-maint' into 2.1-maint

    Chris Gioran authored
  4. Fixes single compilation error in TestRecoveryScenarios

    Chris Gioran authored
  5. Ensures NSDS heals the KernelHealth after successful startup

    Chris Gioran authored
    KernelHealth is a component that keeps state of the last kernel
     panic and prohibits database writes until it is resolved. So
     far this state was never reset even though it could happen that
     internal restarts (in the case of HA) might lead to recovery and
     resolution of the panic cause. This patch makes sure that after
     a successful startup cycle on NSDS the kernel health is restored.
  6. Extracts and uses an NeoStoreDataSourceRule resource for tests

    Chris Gioran authored
    Setting up a NeoStoreDataSource for testing can be complicated. This
     patch introduces a JUnit @Rule for that purpose and uses it in
     TestNeoStore
  7. @tinwelint

    Fixes an issues with growing property block array in property encoder…

    tinwelint authored
    … step
    
    of import tool. Should only occur on really small datasets (< 5) however.
  8. @tinwelint
  9. @davidegrohmann

    Fix input position in syntax and semantic exceptions

    davidegrohmann authored
    Previously the errors were reporting the wrong position due to the
    fact that part of the string input was consumed by a pre-parser, now
    we make sure to consider the pre-parsed offset when reporting errors.
Commits on Mar 28, 2015
  1. @tinwelint
  2. Merge branch '2.1-maint'

    Chris Gioran authored
    Conflicts:
    	community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestBrokenStoreRecovery.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestApplyTransactions.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestTxEntries.java
    	community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java
  3. Merge branch '2.0-maint' into 2.1-maint

    Chris Gioran authored
  4. Merge branch '1.9-maint' into 2.0-maint

    Chris Gioran authored
    Conflicts:
    	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestBrokenStoreRecovery.java
    	community/kernel/src/test/java/org/neo4j/test/EphemeralFileSystemRule.java
Commits on Mar 27, 2015
  1. @tinwelint

    Merge remote-tracking branch 'upstream/2.1-maint'

    tinwelint authored
    Made this a null-erge, nothing changed. I have no idea how to implement
    this for 2.2, it'll have to a re-implementation of the original author.
    
    Conflicts:
    	community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/CommunityLockClient.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/LockTransaction.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TransactionImpl.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TransactionStateFactory.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
    	enterprise/ha/src/main/java/org/neo4j/kernel/ha/lock/SlaveLocksClient.java
  2. @tinwelint

    Merge pull request #4248 from martinfurmanski/2.1-debug-locks

    tinwelint authored
    Keep track of transactions and threads associated with locks.
  3. @tinwelint

    Merge pull request #4300 from tinwelint/2.2-import-bad-rel-prop-fix

    tinwelint authored
    Fixes an import issue where relationships could get wrong sets of properties
  4. @tinwelint

    Merge pull request #4299 from tinwelint/2.2-csv-dont-store-empty-array

    tinwelint authored
    Will not store empty arrays from CSV input in entities during import
  5. @rickardoberg @tinwelint

    For some reason SwitchToMaster is listed as "JNI Global" GC root in V…

    rickardoberg authored tinwelint committed
    …isualVM, thus making it impossible to GC the entire database. This causes OOMs during testing when we create/destroy databases within one JVM session. Fix is to clear all references in STM on shutdown.
  6. @boggle @davidegrohmann
  7. @boggle @davidegrohmann

    Refactor context use in IDPSolver

    boggle authored davidegrohmann committed
  8. @tinwelint

    Fixes import issue where relationships could get wrong sets of proper…

    tinwelint authored
    …ties
    
    this would happen on batches where there were skipped relationships. Any
    relationships after skipped relationships in that batch would have their
    sets of properties shifted the number of steps there were skipped
    relationships at that position. So the import would create a consistent
    database, just semantically incorrect.
  9. @tinwelint

    Will not store empty arrays from CSV input in entities during import

    tinwelint authored
    since that's just overhead. Querying will (or at least is able to)
    handle absence of such values anyway.
  10. @cleishm
Commits on Mar 26, 2015
  1. @tinwelint

    Likely fix for flaky HAClusterStartupIT

    tinwelint authored
    adding a "sync" call before starting each test because the logic of most
    of the tests depend on it. Without it the outcome would depend on the
    order in which the instances happened to start up the second time.
  2. @apcj

    Merge pull request #4271 from oskarhane/2.2-fix-document-state

    apcj authored
    Reset loaded document on script execution.
  3. @apcj

    Merge pull request #4276 from oskarhane/2.2-ga-fixes

    apcj authored
    2.2 Browser fixes
  4. @apcj

    Merge pull request #4289 from oskarhane/2.2-fix-empty-results

    apcj authored
    Fix empty results in rows view.
  5. @apcj

    Merge pull request #4291 from apcj/shutdown-failed-start

    apcj authored
    Always shutdown on failed attempt to start server.
  6. @oskarhane

    Fix empty results in rows view.

    oskarhane authored
    - Add text to hint the user why there's nothing to show.
    It could be that nothing was returned or the returned
    results were empty.
    
    - Add `(empty)` holder to show that a returned node has no properties
    OR that a returned string has no length (it exists, but is empty).
Something went wrong with that request. Please try again.