Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a06c5df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a06c5df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a06c5df Branch: refs/heads/ignite-sql-opt-2 Commit: 9a06c5df75909c7a21a07c68336a942ad6248e75 Parents: eed8e6a c23cda1 Author: sboikov <[email protected]> Authored: Tue Nov 24 19:36:03 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 24 19:36:03 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- .../java/org/apache/ignite/IgniteBinary.java | 6 +---- .../apache/ignite/binary/BinaryIdMapper.java | 2 +- .../apache/ignite/binary/BinarySerializer.java | 2 +- .../internal/portable/BinaryTypeImpl.java | 4 ++- .../processors/cache/CacheObjectContext.java | 26 +++++++++++++++++--- .../datastructures/GridCacheAtomicLongImpl.java | 6 ++++- .../portable/BinaryMarshallerSelfTest.java | 6 ++--- .../examples/project/vs/ignite-examples.vcxproj | 6 ++--- 9 files changed, 40 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
