Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a57ada58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a57ada58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a57ada58 Branch: refs/heads/ignite-45 Commit: a57ada5873e83d2ea6dbed75fb1ba99f19c65c0c Parents: a6e063b 19cf044 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Mar 21 22:36:44 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Mar 21 22:36:44 2015 -0700 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 15 +- .../examples/ScalarCacheQueryExample.scala | 5 +- .../examples/ScalarSnowflakeSchemaExample.scala | 5 +- .../core/licenses/pcollections-mit-license.txt | 19 - .../org/apache/ignite/IgniteJdbcDriver.java | 10 - .../resources/META-INF/licenses/apache-2.0.txt | 202 ----------- .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 ------------------- .../resources/META-INF/licenses/snaptree.txt | 35 -- 8 files changed, 3 insertions(+), 637 deletions(-) ----------------------------------------------------------------------
