GitHub user zstan opened a pull request:

    https://github.com/apache/ignite/pull/1542

    IGNITE-4710 extended optimistic tx lock conflict exception message 

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/gridgain/apache-ignite ignite-4710

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/ignite/pull/1542.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1542
    
----
commit 71d69408e78a781f64f99c9ab75fec0c36c422ea
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-05T16:28:33Z

    ignite-gg-11650  destroy all cache if activation fail

commit 1eb73d952f740305ec37e37efa0c5333fc2dd032
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-05T16:37:54Z

    gg-11730 : Fixed inconsistency between data and indexes caused by updates 
while node is stopping.

commit 806e41d14a81d7f3cc51384071a4d6c3428ef899
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-05T16:50:49Z

    ignite-gg-11650  destroy all cache if activation fail (fix test fail)

commit dda12750387de278b2ca91aa6d466d28f78e9293
Author: devozerov <voze...@gridgain.com>
Date:   2016-11-24T08:14:08Z

    IGNITE-4270: Allow GridUnsafe.UNALIGNED flag override.

commit e657456e13698bcb3784bf3ee77e1f85785d8968
Author: devozerov <voze...@gridgain.com>
Date:   2016-11-25T08:22:05Z

    IGNITE-4270: Fixed system property name.

commit 09ccb7052ebbfd486dfdb835c8d9ff7813ef94ba
Author: EdShangGG <eshangar...@gridgain.com>
Date:   2016-12-05T16:58:44Z

    Revert Partitioned index - WIP.

commit a0dd3d93cab1bb076898f47ff09fcf1e9533b90a
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-05T17:09:45Z

    ignite-gg-11650  add deployId for deactivate caches

commit 81ee8c01b8dec8e21106db8c6712883dfd4263f2
Author: EdShangGG <eshangar...@gridgain.com>
Date:   2016-12-06T09:19:16Z

    Merge remote-tracking branch 'origin/ignite-gg-8.0.1.ea7' into 
ignite-db-x-backup-idx

commit cf9bbaaa38368dce2fa07cfa55900e9e3df8b4b3
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date:   2016-12-06T12:14:03Z

    Merge gg-11721 ignite-gg-8.0.1.ea7

commit 639aa92479083f1e692479182e9f6b2c610254ef
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date:   2016-12-06T12:14:40Z

    Merge gg-11721 ignite-gg-8.0.1.ea7 (minor)

commit 3ac945c78a839e825063bf11f06192fdd01c8b31
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-06T15:39:13Z

    gg-11730 : Minors.

commit 8b9df7a3a2a5b8d318194f37aff71fa7939011a8
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-06T15:40:03Z

    gg-11708 : Minors.

commit 3371cebf1095a8d033e987c63e6040bec28f0dfd
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-06T16:08:50Z

    Merge branches 'ignite-gg-11708' and 'ignite-gg-8.0.1.ea7' of 
https://github.com/gridgain/apache-ignite into ignite-gg-11708
    
    # Conflicts:
    #   
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
    
    Merge branches 'ignite-gg-11708' and 'ignite-gg-8.0.1.ea7' of 
https://github.com/ggprivate/ggprivate into ignite-gg-11708
    
    # Conflicts:
    #   
modules/core/src/main/java/org/gridgain/grid/internal/processors/cache/database/pagemem/FullPageIdTable.java
    #   
modules/pds/src/main/java/org/gridgain/grid/internal/processors/cache/database/GridCacheDatabaseSharedManager.java

commit f308cd87b2eee0c81768783de531783c623ef396
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-06T16:41:00Z

    ignite-gg-11650  refactoring + failover tests

commit 1e5bb0ad36aa010fa0801b6f534ba4fe7f5b0c8c
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date:   2016-12-07T08:55:07Z

    Do not call assignPartitionStates() for local caches

commit 90986022d30bc03529a77d94c5373149b023d23b
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-07T09:26:57Z

    ignite-gg-11650  cleaning activation context

commit a7c4482876661ccda7e183f20b5b4632221e455f
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-07T10:20:59Z

    ignite-gg-11650  small update fro clearing act context

commit 68fc7f7666c50f75e05eda758d0f03e15f3026cd
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date:   2016-12-07T11:58:45Z

    GG-11738 Implemented UI for activate/deactivate cluster.

commit 991eff2372fcd422b5941f01c80a9b4249e02ba6
Author: EdShangGG <eshangar...@gridgain.com>
Date:   2016-12-07T17:56:50Z

    GG-11688 Extend Backup SPI to get information about backup from whole 
cluster
    -tests pass
    -API changes

commit e05ea2fc1009f783572d9cabba80ebf0f6fbb6da
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date:   2016-12-08T10:45:26Z

    Updated classnames.properties to run from IDE.

commit 7389c1bbd42b1601883ec4952459dd5882154d3f
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-08T12:25:17Z

    Merge branches 'ignite-gg-11730' and 'ignite-gg-8.0.1.ea7' of 
https://github.com/gridgain/apache-ignite into ignite-gg-8.0.1.ea7

commit b75c1ca32ec41715a69b59bceeb65c9e9cdd7050
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-08T13:15:42Z

    Fixed index consistency.

commit 1b6402fd2cc674f736319e84e50f769768b89a27
Author: EdShangGG <eshangar...@gridgain.com>
Date:   2016-12-08T13:49:50Z

    GG-11688 Extend Backup SPI to get information about backup from whole 
cluster
    -new tests
    -new checks while snapshot restore
    -refactorings

commit 6d781b7b4e8ad95234de71390baae74d0e322407
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-08T14:19:47Z

    ignite-gg-11650 activeOnStart as argument

commit 9d053e4742be47850c7078e79a824d7844ce6510
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-08T16:04:08Z

    ignite-gg-11650 move activate/deactivate code to clusterStateProcessor

commit 9dc67c10e57b32fee4324819705fae0f4a72b98c
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date:   2016-12-09T10:40:34Z

    GG-11754 - Fix integer overflow for absolute pointer calculation

commit a44dc7d7a94b780aa21579a4489454d3011bb25b
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date:   2016-12-09T12:32:23Z

    ea7 - Visor - correct sizes.

commit d246d9a2b5758a6860258d52e5e6cd915be371f4
Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com>
Date:   2016-12-09T13:25:41Z

    ignite-gg-11650 minor update + activate/deactivate from IgniteMXBean

commit 9bf14d05e02fe7cb0b317931d6d6e28db600543c
Author: EdShangGG <eshangar...@gridgain.com>
Date:   2016-12-09T13:30:18Z

    GG-11688 Extend Backup SPI to get information about backup from whole 
cluster
    -renaming Backup -> Snapshot (part 1)

commit 02e3b656e324d999800bd8ceb41441f75d370862
Author: Ilya Lantukh <ilant...@gridgain.com>
Date:   2016-12-08T14:58:54Z

    IGNITE-4336 Manual rebalance can't be requested twice
    
    (cherry picked from commit 9a691c4)

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to