Merge branch 'ignite-964' into ignite-964-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d218dfb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d218dfb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d218dfb1 Branch: refs/heads/ignite-964-1 Commit: d218dfb1d3e3f75a5b96cfb1c4aace9489f76731 Parents: 8744687 f260e9b Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jun 30 11:05:00 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jun 30 11:05:00 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(-) ----------------------------------------------------------------------