Merge branch 'ignite-543' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Conflicts:
examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8e8131a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8e8131a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8e8131a
Branch: refs/heads/ignite-45
Commit: d8e8131a25d0168737f54bd85242fd63f72f674a
Parents: 728528f
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Fri Mar 20 20:14:33 2015 -0700
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Fri Mar 20 20:14:33 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/examples/datagrid/CacheQueryExample.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8e8131a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index ca3e91c..9d9a6fd 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -242,7 +242,7 @@ public class CacheQueryExample {
* Populate cache with test data.
*/
private static void initialize() {
- IgniteCache cache<Object, Object> =
Ignition.ignite().jcache(CACHE_NAME);
+ IgniteCache<Object, Object> cache =
Ignition.ignite().jcache(CACHE_NAME);
// Organizations.
Organization org1 = new Organization("GridGain");
