[19/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2

[sboikov]

Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2

Conflicts:
        
modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java


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

Branch: refs/heads/sprint-1
Commit: 52d3d5ff013ba3ddba5775be8754a837276e7699
Parents: 5037d10 4fc2b25
Author: Artem Shutak <ashu...@gridgain.com>
Authored: Thu Feb 5 13:46:15 2015 +0300
Committer: Artem Shutak <ashu...@gridgain.com>
Committed: Thu Feb 5 13:46:15 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/compute/ComputeTaskSession.java  | 3 ---
 .../src/main/java/org/apache/ignite/compute/gridify/Gridify.java | 4 +---
 .../java/org/apache/ignite/compute/gridify/GridifySetToSet.java  | 4 +---
 .../org/apache/ignite/compute/gridify/GridifySetToValue.java     | 4 +---
 .../org/apache/ignite/configuration/IgniteDeploymentMode.java    | 2 +-
 .../java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java   | 2 +-
 .../org/apache/ignite/cache/websession/GridWebSessionFilter.java | 4 ++--
 7 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52d3d5ff/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java
----------------------------------------------------------------------
diff --cc 
modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java
index 8195d6c,24e7a8f..894c658
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java
@@@ -55,7 -55,7 +55,7 @@@ import static org.apache.ignite.transac
   *
   * &lt;!-- You can also specify a custom URL pattern. --&gt;
   * &lt;filter-mapping&gt;
-  *     &lt;filter-name&gt;GridWebSessionsFilter&lt;/filter-name&gt;
 - *     &lt;filter-name&gt;GridWebSessionFilter&lt;/filter-name&gt;
++ *     &lt;filter-name&gt;GridGainWebSessionsFilter&lt;/filter-name&gt;
   *     &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
   * &lt;/filter-mapping&gt;
   * </pre>