Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-496
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/32f2c755 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/32f2c755 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/32f2c755 Branch: refs/heads/ignite-496 Commit: 32f2c75518b258b18921e20bf2f622a764fdbaed Parents: 00e263d 740d4be Author: sboikov <semen.boi...@inria.fr> Authored: Wed Mar 25 04:22:06 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Wed Mar 25 04:22:06 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/schema/CacheConfig.java | 2 +- .../src/main/java/org/apache/ignite/schema/Demo.java | 2 +- .../src/main/java/org/apache/ignite/schema/DemoNode.java | 2 +- .../src/main/java/org/apache/ignite/schema/Person.java | 6 +++--- .../src/main/java/org/apache/ignite/schema/PersonKey.java | 4 ++-- .../org/apache/ignite/examples/datagrid/CacheQueryExample.java | 4 ---- .../examples/java8/streaming/marketdata/StreamMarketData.java | 3 ++- 7 files changed, 10 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
