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

2015-07-07 Thread sboikov
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/6ed5c1c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ed5c1c6 Diff: http://git-wip-us.ap

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

2015-07-07 Thread sboikov
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/96c96952 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96c96952 Diff: http://git-wip-us.ap

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

2015-01-14 Thread sboikov
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/d45bdd74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d45bdd74 Diff: http://git-wip-us.ap

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

2014-12-11 Thread vkulichenko
Merge remote-tracking branch 'origin/master' into ignite-9469 Conflicts: modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incuba