Return-Path: 
 <commits-return-81198-apmail-ignite-commits-archive=ignite.apache.org@ignite.apache.org>
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 47576182CA
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Tue, 17 Nov 2015 15:06:21 +0000 (UTC)
Received: (qmail 40997 invoked by uid 500); 17 Nov 2015 15:06:21 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 40959 invoked by uid 500); 17 Nov 2015 15:06:21 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 40946 invoked by uid 99); 17 Nov 2015 15:06:21 -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; Tue, 17 Nov 2015 15:06:21 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 156CBDFF87; Tue, 17 Nov 2015 15:06:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ntikhonov@apache.org
To: commits@ignite.apache.org
Message-Id: <935fdd8a9979445e9d710541c2714198@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ignite git commit: Merge branch 'ignite-1.5' into ignite-426-2
Date: Tue, 17 Nov 2015 15:06:21 +0000 (UTC)

Repository: ignite
Updated Branches:
  refs/heads/ignite-426-2 d196c06be -> 203e88b92


Merge branch 'ignite-1.5' into ignite-426-2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/203e88b9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/203e88b9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/203e88b9

Branch: refs/heads/ignite-426-2
Commit: 203e88b929538250c6a16c74399460ccc75a633c
Parents: d196c06
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Nov 17 15:54:23 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Nov 17 15:54:23 2015 +0300

----------------------------------------------------------------------
 config/default-config.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/203e88b9/config/default-config.xml
----------------------------------------------------------------------
diff --git a/config/default-config.xml b/config/default-config.xml
index e616711..8cfa6c6 100644
--- a/config/default-config.xml
+++ b/config/default-config.xml
@@ -21,5 +21,17 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                             http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.apache.ignite.configuration.IgniteConfiguration"/>
+    <bean class="org.apache.ignite.configuration.IgniteConfiguration">
+              <property name="cacheConfiguration">
+            <list>
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="atomic"/>
+
+                    <property name="cacheMode" value="PARTITIONED"/>
+
+                    <property name="atomicityMode" value="ATOMIC"/>
+
+                    <property name="swapEnabled" value="false"/>
+                </bean>
+    </bena> 
 </beans>