[2/3] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-16

2015-02-02 Thread vozerov
Merge branch 'sprint-1' into ignite-16 Conflicts: modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.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/2636e2c

[2/3] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-16

2015-01-27 Thread vozerov
Merge branch 'sprint-1' into ignite-16 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bab0cbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bab0cbc Diff: http://git-wip-us.apache.o