Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-99-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a83ae290 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a83ae290 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a83ae290 Branch: refs/heads/ignite-99-2 Commit: a83ae290b98a2f659e2f7abe1f2d92fc0a7205b8 Parents: ca53075 fa69c3f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jan 27 17:16:48 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jan 27 17:16:48 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheEntryEvent.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../configuration/IgniteConfiguration.java | 27 +-- .../ignite/dotnet/GridDotNetConfiguration.java | 113 ---------- .../dotnet/GridDotNetPortableConfiguration.java | 207 ------------------ .../GridDotNetPortableTypeConfiguration.java | 219 ------------------- .../java/org/apache/ignite/dotnet/package.html | 23 -- .../org/apache/ignite/internal/GridGainEx.java | 4 +- .../ignite/interop/InteropConfiguration.java | 30 +++ .../java/org/apache/ignite/interop/package.html | 15 ++ .../apache/ignite/mxbean/IgniteCacheMXBean.java | 2 +- .../transactions/IgniteTxConcurrency.java | 2 +- pom.xml | 132 ++++++----- 13 files changed, 138 insertions(+), 640 deletions(-) ----------------------------------------------------------------------
