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/78b432c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78b432c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78b432c8 Branch: refs/heads/ignite-239 Commit: 78b432c8b852cdb425c0c8d97ebb9210884b0df4 Parents: 4567925 d7f173c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 16 15:58:26 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 16 15:58:26 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheDeploymentManager.java | 33 +++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
