[3/7] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'

2015-08-07 Thread vozerov
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63944d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63944d41 Diff: http://git-wip-us.ap

[3/7] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'

2014-12-23 Thread sboikov
Merge remote-tracking branch 'origin/master' Conflicts: modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicated