Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a1aa24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a1aa24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a1aa24 Branch: refs/heads/ignite-sql Commit: 17a1aa24b9e738111514f39650627b4a7e2fb616 Parents: 4da1ca3 fa69c3f Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Jan 27 17:22:22 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Jan 27 17:22:22 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(-) ----------------------------------------------------------------------
