Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/761882bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/761882bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/761882bb Branch: refs/heads/master Commit: 761882bb129dcc87bd2c8ba12bbc26c9234d2d5f Parents: 9138bd6 d7f173c Author: sboikov <[email protected]> Authored: Mon Feb 16 16:15:32 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Feb 16 16:15:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheDeploymentManager.java | 33 +++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
