Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78C3E18069 for ; Wed, 11 Nov 2015 10:46:31 +0000 (UTC) Received: (qmail 71289 invoked by uid 500); 11 Nov 2015 10:46:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71161 invoked by uid 500); 11 Nov 2015 10:46:31 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 69953 invoked by uid 99); 11 Nov 2015 10:46:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2015 10:46:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C6A7E38F3; Wed, 11 Nov 2015 10:46:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Wed, 11 Nov 2015 10:47:14 -0000 Message-Id: In-Reply-To: <39bcf58a017345afb9e88359ad671ce4@git.apache.org> References: <39bcf58a017345afb9e88359ad671ce4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/48] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b158c9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b158c9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b158c9d Branch: refs/heads/ignite-cont-merge Commit: 6b158c9ddf61159ce8f622832713e0bc508d1fb8 Parents: d567d259 388a892 Author: sboikov Authored: Wed Nov 11 10:20:22 2015 +0300 Committer: sboikov Committed: Wed Nov 11 10:20:22 2015 +0300 ---------------------------------------------------------------------- .../cache/store/CacheStoreSessionListener.java | 9 +- .../jdbc/CacheJdbcStoreSessionListener.java | 8 +- .../GridCachePartitionExchangeManager.java | 34 ++-- .../dht/preloader/GridDhtPartitionDemander.java | 25 ++- .../store/GridCacheStoreManagerAdapter.java | 26 ++- .../GridCacheAtomicReferenceImpl.java | 2 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../org/apache/ignite/stream/StreamAdapter.java | 2 +- .../store/GridCacheBalancingStoreSelfTest.java | 181 ++++++++++++++++++- ...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +- modules/rest-http/pom.xml | 11 ++ .../yardstick/config/ignite-store-config.xml | 31 ++-- modules/zookeeper/pom.xml | 2 +- 13 files changed, 293 insertions(+), 60 deletions(-) ----------------------------------------------------------------------