Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d65d117 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d65d117 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d65d117 Branch: refs/heads/sprint-2-ide-settings Commit: 0d65d117564d4ef8937236bdcaa917060a7248ee Parents: 950732e d297e06 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 1 13:11:20 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 1 13:11:20 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/CacheObjectByteArrayImpl.java | 2 +- .../org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------