Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d14ec6e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d14ec6e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d14ec6e Branch: refs/heads/ignite-1537 Commit: 5d14ec6e2d678fdbf2c99e8e18591c35be4265ae Parents: da3f323 8033bc4 Author: sboikov <[email protected]> Authored: Mon Dec 7 09:37:51 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 7 09:37:51 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 1 + .../datagrid/store/auto/CacheBinaryAutoStoreExample.java | 2 +- .../examples/datagrid/store/auto/CacheAutoStoreExample.java | 2 +- .../org/apache/ignite/internal/MarshallerContextImpl.java | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
