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

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

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

2014-12-23 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/e01d3c36 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e01d3c36 Diff: http://git-wip-us.ap

[5/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/GridCacheStoreManager.java modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java mo