Merge branches 'ignite-714' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-714
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d54b74bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d54b74bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d54b74bb Branch: refs/heads/ignite-738 Commit: d54b74bb55df21cb59512b1ff6992fede55bbed3 Parents: ef12ba6 9b03ae1 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Apr 9 23:39:04 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Apr 9 23:39:04 2015 -0700 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 19 ------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 3 ++- .../ignite/GridCacheAffinityBackupsSelfTest.java | 15 +++++++-------- ...chePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 3 ++- .../IgniteCachePartitionedQuerySelfTest.java | 5 +++-- .../IgniteCacheReplicatedQuerySelfTest.java | 7 ++++--- 7 files changed, 19 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
