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 BF48518974 for ; Thu, 19 Nov 2015 12:17:31 +0000 (UTC) Received: (qmail 35280 invoked by uid 500); 19 Nov 2015 12:17:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35171 invoked by uid 500); 19 Nov 2015 12:17: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 34769 invoked by uid 99); 19 Nov 2015 12:17:31 -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; Thu, 19 Nov 2015 12:17:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 51C41E17DD; Thu, 19 Nov 2015 12:17:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 19 Nov 2015 12:17:48 -0000 Message-Id: <46fa4c4c53ea4d46ab7f6bc6cb609521@git.apache.org> In-Reply-To: <064f818af8cd464b87d44fc7d1dfcc0c@git.apache.org> References: <064f818af8cd464b87d44fc7d1dfcc0c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] 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-530-pull-fixes 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(-) ----------------------------------------------------------------------