Merge branches 'ignite-341' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ebb7238 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ebb7238 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ebb7238 Branch: refs/heads/ignite-424 Commit: 3ebb7238bb5bf6994d60631d7a6f2ab5bc5c241a Parents: 3d30d5f 988b6b9 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Mar 26 21:34:00 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Mar 26 21:34:00 2015 -0700 ---------------------------------------------------------------------- .../internal/MarshallerContextAdapter.java | 5 +- .../ignite/internal/MarshallerContextImpl.java | 62 +++++++++----------- .../ignite/marshaller/MarshallerContext.java | 5 +- .../optimized/OptimizedMarshallerUtils.java | 2 +- 4 files changed, 35 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
