Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e5ae0fb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e5ae0fb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e5ae0fb Branch: refs/heads/ignite-1758 Commit: 6e5ae0fb65ad56da317d90e0dc629cb66a682416 Parents: 8b55298 37cafb6 Author: sboikov <[email protected]> Authored: Tue Nov 10 15:53:41 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 10 15:53:41 2015 +0300 ---------------------------------------------------------------------- .../GridCacheAtomicReferenceImpl.java | 2 +- .../store/GridCacheBalancingStoreSelfTest.java | 181 ++++++++++++++++++- ...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +- modules/rest-http/pom.xml | 11 ++ .../yardstick/config/ignite-store-config.xml | 31 ++-- 5 files changed, 228 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
