Merge branch 'ignite-1' into ignite-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3975c101 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3975c101 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3975c101 Branch: refs/heads/ignite-54 Commit: 3975c10114a11637d0aa13a41ab7710d78ab04b5 Parents: ae20d10 80b986f Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Jan 19 13:01:11 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Jan 19 13:01:11 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheInvokeEntry.java | 14 ++++++ .../processors/cache/GridCacheMapEntry.java | 17 ++++++- .../cache/transactions/IgniteTxAdapter.java | 22 +++++++- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++-------- .../java/org/gridgain/grid/p2p/p2p.properties | 17 ------- 5 files changed, 82 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
