Merge remote-tracking branch 'remotes/origin/ignite-961' into ignite-964
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f260e9bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f260e9bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f260e9bc Branch: refs/heads/ignite-964 Commit: f260e9bc0fabaa753aa4cc7dcea466fb6de07b1e Parents: 02b5387 d5aa28c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jun 30 11:04:19 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jun 30 11:04:19 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheDeploymentManager.java | 10 ++-- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +++- .../core/src/test/config/spark/spark-config.xml | 46 ++++++++++++++++++ .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 ++++++++++++++++++-- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 +++++++ 8 files changed, 127 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
