Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignite 4584 #1592

Closed
wants to merge 117 commits into from
Closed

Ignite 4584 #1592

wants to merge 117 commits into from

Commits on Jan 20, 2017

  1. IGNITE-4580 change async API at the IgniteCompute, change examples, a… 

    …dd tests to FullAPI suite
    tledkov-gridgain committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    b81621b View commit details
    Browse the repository at this point in the history

  2. IGNITE-4580 rename internal methods

    tledkov-gridgain committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    310c846 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2017

  1. IGNITE-4581: add new async public API

    tledkov-gridgain committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    b1918f0 View commit details
    Browse the repository at this point in the history

  2. IGNITE-4581: fix text cache proxy

    tledkov-gridgain committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    2a14d1d View commit details
    Browse the repository at this point in the history

  3. IGNITE-4581: modify examples and full API tests

    tledkov-gridgain committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    02ae641 View commit details
    Browse the repository at this point in the history

  4. IGNITE-4581: javadoc

    tledkov-gridgain committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    da26d53 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2017

  1. Merge branch 'ignite-2.0' into ignite-4580

    devozerov committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    30b0bd5 View commit details
    Browse the repository at this point in the history

  2. Minors.

    devozerov committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    3e7e00f View commit details
    Browse the repository at this point in the history

  3. IGNITE-4581: revert IgniteAsyncSupported annotation

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    6c8fe6d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ignite-2.0' into ignite-4581

    devozerov committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    48112a2 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4581: modify PlatformCache to use new async API

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    2160eaf View commit details
    Browse the repository at this point in the history

  6. IGNITE-4580: use IgniteFuture instead of ComputeTaskFuture for closures

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    cb5595c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ignite-4580' into ignite-4581

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    dffc5f9 View commit details
    Browse the repository at this point in the history

  8. IGNITE-4581: add tests for new async methods

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    9f165d4 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    42d653a View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2017

  1. IGNITE-4582: Async API: IgniteFileSystem refactoring

    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    38e2f78 View commit details
    Browse the repository at this point in the history

  2. cosmetic

    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    696d003 View commit details
    Browse the repository at this point in the history

  3. IGNITE-4581: remove currentFuture impl from PlatformCache

    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    37a8bcd View commit details
    Browse the repository at this point in the history

  4. IGNITE-4583: new async API at the IgniteCluster, IgniteEvents, Ignite… 

    …Messaging, IgniteServices, Transaction
    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    808bc36 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4583: add tests for new API

    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    f3b7c27 View commit details
    Browse the repository at this point in the history

  6. Merge branches 'ignite-4581', 'ignite-4582' and 'ignite-4583' into ig… 

    …nite-4584
    tledkov-gridgain committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    557ab87 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    15785c8 View commit details
    Browse the repository at this point in the history

  2. IGNITE-4581: revert platform changes

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    b671227 View commit details
    Browse the repository at this point in the history

  3. IGNITE-4581: fix platform cache

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    321dc04 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'community/ignite-4581' into ignite-4581 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    a146e80 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4581: fix platform cache

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    d2984e0 View commit details
    Browse the repository at this point in the history

  6. IGNITE-4581: use new async API instead old at the ignite

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    24cd711 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ignite-4580' into ignite-4581

    tledkov-gridgain committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    1039b55 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    2881c99 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    eb246ec View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. IGNITE-4581: fix load cache

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    bcb5b98 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'community/ignite-4581' into ignite-4581

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    a4c4b61 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ignite-2.0' into ignite-4580

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    9e708df View commit details
    Browse the repository at this point in the history

  4. IGNITE-4580: compilation fixed

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    a069628 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ignite-4580' into ignite-4581

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    0312add View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ignite-2.0' into ignite-4582 

    # Conflicts:
#	modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    93485f4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ignite-2.0' into ignite-4583

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    ba352ed View commit details
    Browse the repository at this point in the history

  8. IGNITE-4583: fix platforms

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    88abbb0 View commit details
    Browse the repository at this point in the history

  9. IGNITE-4583: fix platforms

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    082ccfd View commit details
    Browse the repository at this point in the history

  10. IGNITE-4580: cosmetic

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    7241c8c View commit details
    Browse the repository at this point in the history

  11. IGNITE-4581: cosmetic

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    e06ca32 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'ignite-4580' into ignite-4581

    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    a0fe09c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'ignite-2.0' into ignite-4584 

    # Conflicts:
#	modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    d4a822f View commit details
    Browse the repository at this point in the history

  14. Merge branches 'ignite-4581', 'ignite-4582' and 'ignite-4583' into ig… 

    …nite-4584
    tledkov-gridgain committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    07d4512 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. javadoc

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    159a855 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-4581' into ignite-4584

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    fbe6c1e View commit details
    Browse the repository at this point in the history

  3. IGNITE-4584: save the progress

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    0bd7154 View commit details
    Browse the repository at this point in the history

  4. IGNITE-4581: add deprecated annotation

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    3388c65 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4582: add deprecated annotation

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    c928472 View commit details
    Browse the repository at this point in the history

  6. IGNITE-4583: add deprecated annotation

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    4e05073 View commit details
    Browse the repository at this point in the history

  7. Merge branches 'ignite-4581', 'ignite-4582' and 'ignite-4583' into ig… 

    …nite-4584
    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    464ac53 View commit details
    Browse the repository at this point in the history

  8. IGNITE-4584: save the progress

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    e23ad87 View commit details
    Browse the repository at this point in the history

  9. IGNITE-4583: fix the future type

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    aba8870 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ignite-4583' into ignite-4584

    tledkov-gridgain committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    40e6598 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2017

  1. IGNITE-4584: save the progress

    tledkov-gridgain committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    e913f5d View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. IGNITE-4580: New asyncs for Compute API.

    devozerov committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    a5969cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-4475-async' into ignite-4583

    devozerov committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    4daeb30 View commit details
    Browse the repository at this point in the history

  3. IGNITE-4582: Async API: IgniteFileSystem refactoring.

    devozerov committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    5cf6dc4 View commit details
    Browse the repository at this point in the history

  4. IGNITE-4583: review javadoc

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    c1e3f41 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4583: add tests for services async API

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    2f0c24f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ignite-4475-async' into ignite-4583

    devozerov committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    ab1cb30 View commit details
    Browse the repository at this point in the history

  7. IGNITE-4581: review javadoc

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    0557aa2 View commit details
    Browse the repository at this point in the history

  8. IGNITE-4583: fox transaction async API

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    715bc32 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'community/ignite-4583' into ignite-4583

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    278c0a2 View commit details
    Browse the repository at this point in the history

  10. Merge branches 'ignite-4581' and 'ignite-4583' into ignite-4584 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
#	modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    9e3fb45 View commit details
    Browse the repository at this point in the history

  11. IGNITE-4584: fix tests with new transaction async API

    tledkov-gridgain committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    4c361f6 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'ignite-4475-async' into ignite-4581 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
    @devozerov
    devozerov committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    f2f75d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

  1. IGNITE-4581: fix platform cache

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    995f018 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/ignite-4581' into ignite-4581

    devozerov committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    ef57184 View commit details
    Browse the repository at this point in the history

  3. IGNITE-4583: fix platforms & code cleanup

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    2ae53e2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ignite-2.0' into ignite-4583

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    6a72327 View commit details
    Browse the repository at this point in the history

  5. IGNITE-4583: javadoc

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    a510706 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ignite-2.0' into ignite-4475-async

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    7b370dc View commit details
    Browse the repository at this point in the history

  7. IGNITE-4583: cleanup

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    7e4edab View commit details
    Browse the repository at this point in the history

  8. IGNITE-4583: rollback pom

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    66744c9 View commit details
    Browse the repository at this point in the history

  9. Merge branches 'ignite-4475-async', 'ignite-4581' and 'ignite-4583' i… 

    …nto ignite-4584
    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    d85212e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    11dfd9b View commit details
    Browse the repository at this point in the history

  11. IGNITE-4581: minors

    tledkov-gridgain committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    bb2bee4 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Merge branch 'master' into ignite-4475-async

    devozerov committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    055295e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-2.0' into ignite-4475-async

    devozerov committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    dd4d439 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    f773aab View commit details
    Browse the repository at this point in the history

  2. IGNITE-4581: supress unchecked warnings

    tledkov-gridgain committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    8984fbe View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/ignite-4475-async' into ignite-4… 

    …475-async
    tledkov-gridgain committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    8dcb503 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. IGNITE-4583: new async API at the IgniteCluster, IgniteEvents, Ignite… 

    …Messaging, IgniteServices, Transaction.
    devozerov committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    fde1f48 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-4475-async' into ignite-4581

    devozerov committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    4cc91c2 View commit details
    Browse the repository at this point in the history

  3. Minors.

    devozerov committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    71f9dc2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/ignite-4581' into ignite-4581

    devozerov committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    657257d View commit details
    Browse the repository at this point in the history

  5. IGNITE-4581: remove PlatformAsyncTarget.currentFuture() method

    tledkov-gridgain committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    7e93ea1 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. IGNITE-4581: complete remove PlatformAsyncTarget

    tledkov-gridgain committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    3d5a046 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-2.0' into ignite-4581

    tledkov-gridgain committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    83fc01e View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. Merge branch 'ignite-4475-async' into ignite-4584

    tledkov-gridgain committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    cb98852 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-4581' into ignite-4584 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java
    tledkov-gridgain committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    6b239d7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ignite-2.0' into ignite-4584

    tledkov-gridgain committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    679ea8d View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. Merge branch 'ignite-2.0' into ignite-4584 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
#	modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    2b8d71d View commit details
    Browse the repository at this point in the history

  2. manual merge

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    0d02710 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ignite-2.0' into ignite-4475-async 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    037662c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ignite-2.0' into ignite-4584

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    5eb01a5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ignite-4475-async' into ignite-4584

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    c486517 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ignite-4581' into ignite-4475-async 

    # Conflicts:
#	modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    be708b3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ignite-2.0' into ignite-4581 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
#	modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    7ab2c94 View commit details
    Browse the repository at this point in the history

  8. manual merge

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    13afffd View commit details
    Browse the repository at this point in the history

  9. merge with 4581

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    2184b6b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ignite-4475-async' into ignite-4584

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    cde38e3 View commit details
    Browse the repository at this point in the history

  11. IGNITE-4584: minors: remove unused import

    tledkov-gridgain committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    a5e244e View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Merge branch 'ignite-2.0' into ignite-4584

    tledkov-gridgain committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    bb52ed6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-2.0' into ignite-4475-async

    tledkov-gridgain committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    17f88e2 View commit details
    Browse the repository at this point in the history

  3. IGNITE-4584: minors cleanup

    tledkov-gridgain committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    b5a7ed4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ignite-2.0' into ignite-4475-async

    tledkov-gridgain committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    7784cb0 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. Merge branch 'ignite-4475-async' into ignite-4584

    devozerov committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    dd3f0ca View commit details
    Browse the repository at this point in the history

  2. IGNITE-4584: use new async api in the tests

    tledkov-gridgain committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    dc72971 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'community/ignite-4584' into ignite-4584

    tledkov-gridgain committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    4955c72 View commit details
    Browse the repository at this point in the history

  4. IGNITE-4584: use new async api

    tledkov-gridgain committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    39d83ce View commit details
    Browse the repository at this point in the history

  5. IGNITE-4584: use new async api

    tledkov-gridgain committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    e7cd9c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Merge branch 'ignite-2.0' into ignite-4584 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxyImpl.java
#	modules/platforms/cpp/jni/include/ignite/jni/exports.h
#	modules/platforms/cpp/jni/include/ignite/jni/java.h
#	modules/platforms/cpp/jni/src/exports.cpp
#	modules/platforms/cpp/jni/src/java.cpp
    tledkov-gridgain committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    4d2ec11 View commit details
    Browse the repository at this point in the history

  2. IGNITE-4584: fix after merge

    tledkov-gridgain committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    ec882c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Merge branch 'master' into ignite-4475-async 

    # Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxy.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTargetProxyImpl.java
#	modules/platforms/cpp/jni/include/ignite/jni/exports.h
#	modules/platforms/cpp/jni/include/ignite/jni/java.h
#	modules/platforms/cpp/jni/src/exports.cpp
#	modules/platforms/cpp/jni/src/java.cpp
    devozerov committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    228322a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ignite-4475-async' into ignite-4584

    devozerov committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    0329a68 View commit details
    Browse the repository at this point in the history