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/05/25 15:25:03 UTC
[11/12] incubator-ignite git commit: Merge branch 'ignite-sprint-5'
into ignite-456
Merge branch 'ignite-sprint-5' into ignite-456
Conflicts:
.gitignore
dev-tools/slurp.sh
dev-tools/src/main/groovy/jiraslurp.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e1fc737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e1fc737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e1fc737
Branch: refs/heads/ignite-456
Commit: 1e1fc737861f754981c3c11e3e29c9fe2fd775b1
Parents: 6b01ddc 6093619
Author: null <null>
Authored: Mon May 25 16:24:09 2015 +0300
Committer: null <null>
Committed: Mon May 25 16:24:09 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropException.java | 65 ++++++++++++++
.../processors/cache/GridCacheAdapter.java | 16 +++-
.../RandomEvictionPolicyCacheSizeSelfTest.java | 72 ++++++++++++++++
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
.../processors/hadoop/v2/HadoopV2Context.java | 10 +--
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../config/benchmark-client-mode.properties | 89 ++++++++++++++++++++
pom.xml | 2 +-
8 files changed, 246 insertions(+), 11 deletions(-)
----------------------------------------------------------------------