Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c7358db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c7358db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c7358db Branch: refs/heads/ignite-426 Commit: 6c7358db22e008f383acb356a3922107531c063b Parents: 3d995af 2173b0e Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Aug 5 16:54:04 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Aug 5 16:54:04 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ignite/spark/IgniteContext.scala | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
