Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a21b50a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a21b50a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a21b50a0
Branch: refs/heads/ignite-1093-2
Commit: a21b50a08e84af5de76cf1c0594253d750d2db92
Parents: a34b20b 75fb19d
Author: Anton Vinogradov <[email protected]>
Authored: Tue Oct 20 14:51:12 2015 +0300
Committer: Anton Vinogradov <[email protected]>
Committed: Tue Oct 20 14:51:12 2015 +0300
----------------------------------------------------------------------
examples-lgpl/config/filesystem/README.txt | 8 -
examples-lgpl/config/filesystem/core-site.xml | 42 -----
.../config/filesystem/example-igfs.xml | 151 ----------------
examples-lgpl/config/servlet/README.txt | 8 -
examples-lgpl/config/servlet/WEB-INF/web.xml | 36 ----
examples-lgpl/pom-standalone.xml | 45 +++++
.../misc/schedule/ComputeScheduleExample.java | 82 +++++++++
.../examples/misc/schedule/package-info.java | 22 +++
.../java8/cluster/ClusterGroupExample.java | 86 ----------
.../examples/java8/cluster/package-info.java | 22 ---
.../java8/computegrid/ComputeAsyncExample.java | 75 --------
.../computegrid/ComputeBroadcastExample.java | 102 -----------
.../computegrid/ComputeCallableExample.java | 75 --------
.../computegrid/ComputeClosureExample.java | 71 --------
.../computegrid/ComputeRunnableExample.java | 64 -------
.../java8/computegrid/package-info.java | 22 ---
.../java8/datagrid/CacheAffinityExample.java | 137 ---------------
.../java8/datagrid/CacheApiExample.java | 105 -----------
.../java8/datagrid/CacheAsyncApiExample.java | 85 ---------
.../examples/java8/datagrid/package-info.java | 22 ---
.../IgniteExecutorServiceExample.java | 70 --------
.../java8/datastructures/package-info.java | 22 ---
.../examples/java8/events/EventsExample.java | 135 ---------------
.../examples/java8/events/package-info.java | 22 ---
.../java8/messaging/MessagingExample.java | 166 ------------------
.../messaging/MessagingPingPongExample.java | 113 ------------
.../examples/java8/messaging/package-info.java | 22 ---
.../misc/schedule/ComputeScheduleExample.java | 24 +--
.../java8/misc/schedule/package-info.java | 24 +--
.../streaming/StreamTransformerExample.java | 101 -----------
.../java8/streaming/StreamVisitorExample.java | 172 -------------------
.../examples/java8/streaming/package-info.java | 22 ---
.../scalar/examples/ScalarScheduleExample.scala | 66 +++++++
.../ScalarLgplExamplesMultiNodeSelfTest.scala | 33 ++++
.../examples/ScalarLgplExamplesSelfTest.scala | 36 ++++
.../ScalarLgplExamplesSelfTestSuite.scala | 37 ++++
examples/config/hibernate/README.txt | 8 -
.../hibernate/example-hibernate-L2-cache.xml | 64 -------
.../misc/schedule/ComputeScheduleExample.java | 82 ---------
.../examples/misc/schedule/package-info.java | 22 ---
.../misc/schedule/ComputeScheduleExample.java | 68 --------
.../java8/misc/schedule/package-info.java | 22 ---
.../scalar/examples/ScalarScheduleExample.scala | 66 -------
.../tests/examples/ScalarExamplesSelfTest.scala | 5 -
...niteCacheClientNodeChangingTopologyTest.java | 4 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 2 +
...gniteAtomicLongChangingTopologySelfTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 +
pom.xml | 132 +++++++-------
49 files changed, 420 insertions(+), 2386 deletions(-)
----------------------------------------------------------------------
