You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/11/25 19:40:06 UTC

[3/8] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9e4e036
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9e4e036
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9e4e036

Branch: refs/heads/ignite-sql-opt-2
Commit: b9e4e0367dd38c5d4053e15e1d7307621f52bcfc
Parents: 8a9cc54 f9690df
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Nov 25 18:23:54 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Nov 25 18:23:54 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml                                |  2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  9 +++--
 .../internal/portable/BinaryReaderExImpl.java   | 18 +++++++--
 .../processors/cache/CacheLockImpl.java         | 18 ++++++++-
 .../colocated/GridDhtColocatedLockFuture.java   |  8 ++--
 .../platform/PlatformContextImpl.java           |  2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++++++++++++++++++-
 .../Services/ServicesExample.cs                 |  4 ++
 modules/scalar/pom.xml                          |  4 +-
 modules/spark/pom.xml                           |  4 +-
 modules/visor-console/pom.xml                   |  2 +-
 parent/pom.xml                                  |  2 +-
 12 files changed, 93 insertions(+), 22 deletions(-)
----------------------------------------------------------------------