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/ff69a8f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff69a8f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff69a8f7 Branch: refs/heads/ignite-239 Commit: ff69a8f78bb007ce54c4569d1e45f3c8f09ac959 Parents: d786666 761882b Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 16 16:23:50 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 16 16:23:50 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheDeploymentManager.java | 33 ++++++------- .../continuous/CacheContinuousQueryManager.java | 49 ++++++++++++-------- pom.xml | 2 +- 4 files changed, 47 insertions(+), 39 deletions(-) ----------------------------------------------------------------------