ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: ignite-929
Date Thu, 11 Jun 2015 11:44:02 GMT
ignite-929


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

Branch: refs/heads/ignite-929
Commit: 2638a747648bb63f2a2533355b48eef2716a8d35
Parents: ea65f29
Author: avinogradov <avinogradov@gridgain.com>
Authored: Thu Jun 11 14:43:49 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Thu Jun 11 14:43:49 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java     | 4 ++--
 parent/pom.xml                                                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2638a747/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index d473efe..a17c696 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1979,8 +1979,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
 
     /**
-     * @param cacheName Cache name to stop.
-     * @return Future that will be completed when cache is stopped.
+     * @param cacheName Cache name to close.
+     * @return Future that will be completed when cache is closed.
      */
     public IgniteInternalFuture<?> dynamicCloseCache(String cacheName) {
         IgniteCacheProxy<?, ?> proxy = jCacheProxies.get(maskNull(cacheName));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2638a747/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f5b73df..b167932 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -626,6 +626,7 @@
                                         <exclude>**/keystore/*.pem</exclude><!--auto
generated files-->
                                         <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
                                         <!--special excludes-->
+                                        <exclude>idea/ignite_codeStyle.xml</exclude>
                                         <exclude>DEVNOTES.txt</exclude>
                                         <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD
license-->
                                         <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD
license-->


Mime
View raw message