Merge branches 'ignite-public-api-cleanup' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-public-api-cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b79d3ae9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b79d3ae9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b79d3ae9 Branch: refs/heads/sprint-1-release Commit: b79d3ae9cc845e86250a43de32b7027711d3335d Parents: 4567925 d7f173c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Feb 16 19:58:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Feb 16 19:58:29 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheDeploymentManager.java | 33 +++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) ----------------------------------------------------------------------