Merge remote-tracking branch 'remotes/origin/sprint-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/74b15016
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74b15016
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74b15016

Branch: refs/heads/ignite-88
Commit: 74b15016e15064600fdab1d3973ae9ca843389de
Parents: 0357b74 fa69c3f
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Tue Jan 27 17:23:00 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Tue Jan 27 17:23:00 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 +-
 pom.xml                                         | 132 ++++++-----
 12 files changed, 137 insertions(+), 639 deletions(-)
----------------------------------------------------------------------


Reply via email to