Merge branches 'ignite-45', 'ignite-45-j8'

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

Branch: refs/heads/ignite-45-j8
Commit: 84cd91cc2cc1f11b7491da17a9b33cf421a77a2d
Parents: f83cfa1
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Fri Mar 20 17:51:46 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Fri Mar 20 17:51:46 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml                                               | 6 +++---
 .../org/apache/ignite/cache/IgniteCacheEntryEventFilter.java   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84cd91cc/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index db91497..a18f90d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,9 +18,9 @@
 -->
 
 <project
-        xmlns="http://maven.apache.org/POM/4.0.0";
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+    xmlns="http://maven.apache.org/POM/4.0.0";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84cd91cc/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
index 67a8f3c..d36a3fb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
@@ -24,4 +24,5 @@ import java.io.*;
  * This filter adds {@link Serializable} interface to {@link 
javax.cache.event.CacheEntryEventFilter} object.
  */
 public interface IgniteCacheEntryEventFilter<K, V> extends 
CacheEntryEventFilter<K, V>, Serializable {
+    // No-op.
 }

Reply via email to