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/12/28 20:06:51 UTC
[2/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-1537' into ignite-1537
Merge remote-tracking branch 'origin/ignite-1537' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7386b8a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7386b8a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7386b8a
Branch: refs/heads/ignite-1537
Commit: f7386b8a408061167895b481eceead3133a679bc
Parents: fd62582 0f80d98
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 28 22:02:37 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 28 22:02:37 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 11 +++
assembly/release-sources.xml | 79 ++++++++++++++++
modules/clients/pom.xml | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 96 +++++++++++++++-----
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../processors/cache/GridCacheProcessor.java | 52 +++++++----
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 44 ++++-----
.../cache/distributed/dht/GridDhtTxLocal.java | 1 +
.../cache/transactions/IgniteTxAdapter.java | 18 ++++
.../cache/transactions/IgniteTxHandler.java | 10 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../datastructures/DataStructuresProcessor.java | 11 ++-
.../processors/rest/GridRestProcessor.java | 4 +
.../rest/client/message/GridClientNodeBean.java | 4 +-
.../handlers/cache/GridCacheCommandHandler.java | 4 +-
.../plugin/security/AuthenticationContext.java | 33 ++++++-
.../cache/IgniteDynamicCacheStartSelfTest.java | 25 +++--
.../continuous/GridEventConsumeSelfTest.java | 3 +
.../internal/util/nio/GridNioSelfTest.java | 11 ++-
modules/platforms/cpp/DEVNOTES.txt | 59 ++++++++++++
modules/platforms/cpp/README.txt | 64 +++----------
modules/platforms/dotnet/Apache.Ignite.sln | 5 +-
modules/platforms/dotnet/DEVNOTES.txt | 18 ++++
.../rest/protocols/http/jetty/rest.html | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
parent/pom.xml | 2 +-
pom.xml | 23 +++--
29 files changed, 433 insertions(+), 163 deletions(-)
----------------------------------------------------------------------