You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/03 05:40:33 UTC

[02/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-239

Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-239


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/706f6054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/706f6054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/706f6054

Branch: refs/heads/ignite-51
Commit: 706f60546a04c11f8301565a0875e91be921e757
Parents: b200912 f27a989
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Feb 16 17:16:09 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Feb 16 17:16:09 2015 +0300

----------------------------------------------------------------------
 assembly/docfiles/tools.js                      |   30 -
 .../examples/datagrid/CacheQueryExample.java    |    6 +-
 .../clients/src/test/resources/spring-cache.xml |   12 -
 .../src/test/resources/spring-server-node.xml   |   21 -
 .../test/resources/spring-server-ssl-node.xml   |   20 +-
 .../java/org/apache/ignite/IgniteCache.java     |    4 +-
 .../apache/ignite/cache/CacheInterceptor.java   |    1 +
 .../apache/ignite/cache/CacheProjection.java    | 1925 ------------------
 .../java/org/apache/ignite/cache/GridCache.java |    1 +
 .../configuration/CacheConfiguration.java       |    1 +
 .../internal/processors/cache/CacheFlag.java    |    6 +-
 .../processors/cache/CacheProjection.java       | 1925 ++++++++++++++++++
 .../processors/cache/GridCacheAdapter.java      |    2 +-
 .../processors/cache/GridCacheMapAdapter.java   |    1 -
 .../processors/cache/GridCachePeekMode.java     |    2 +-
 .../processors/cache/GridCacheProjectionEx.java |    1 -
 .../cache/query/GridCacheQueriesProxy.java      |    1 -
 .../datastructures/GridCacheAtomicLongImpl.java |    1 -
 .../GridCacheAtomicReferenceImpl.java           |    1 -
 .../GridCacheAtomicSequenceImpl.java            |    1 -
 .../GridCacheAtomicStampedImpl.java             |    1 -
 .../GridCacheCountDownLatchImpl.java            |    1 -
 .../internal/visor/query/VisorQueryTask.java    |    1 +
 .../apache/ignite/transactions/Transaction.java |    3 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    1 +
 .../hadoop/jobtracker/GridHadoopJobTracker.java |    1 -
 .../GridHibernateAccessStrategyAdapter.java     |    2 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |    3 +-
 .../apache/ignite/cache/spring/SpringCache.java |    2 +-
 29 files changed, 1947 insertions(+), 2030 deletions(-)
----------------------------------------------------------------------