ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: Merge branch 'ignite-1.5' into ignite-426-2
Date Tue, 17 Nov 2015 15:06:21 GMT
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>


Mime
View raw message