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/67572e59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67572e59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67572e59 Branch: refs/heads/ignite-104 Commit: 67572e59505851741e9e010e94ab78c8213df078 Parents: 825fbc9 8e1492a Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Jul 21 19:51:00 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Jul 21 19:51:00 2015 -0700 ---------------------------------------------------------------------- .../scala/org/apache/ignite/spark/IgniteContext.scala | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ----------------------------------------------------------------------
