Merge branches 'ignite-45' and 'ignite-45-j8' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45-j8
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f83cfa15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f83cfa15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f83cfa15 Branch: refs/heads/ignite-45-j8 Commit: f83cfa15216f083d432d4a44019bb30165edb4b8 Parents: 6b4da9d 77cfef6 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Mar 20 17:44:30 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Mar 20 17:44:30 2015 +0300 ---------------------------------------------------------------------- NOTICE.txt | 2 +- examples/config/servlet/readme.txt | 2 +- .../store/CacheNodeWithStoreStartup.java | 44 ++++++++++++-------- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- 4 files changed, 31 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
