Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da4f24f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da4f24f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da4f24f8 Branch: refs/heads/master Commit: da4f24f8e512f7e8366f6875a147634307ea54b4 Parents: b48899b 4573475 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 12 17:19:08 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 12 17:19:08 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- LICENSE.txt | 2 +- NOTICE.txt | 0 RELEASE_NOTES.txt | 0 modules/core/licenses/snaptree-bsd-license.txt | 35 ++++++++++++++ modules/core/licenses/snaptree-license.txt | 35 -------------- modules/core/licenses/sun-bcl-license.txt | 50 -------------------- .../processors/rest/GridRestCommand.java | 8 +--- .../processors/rest/GridRestProcessor.java | 2 - .../resources/META-INF/licenses/apache-2.0.txt | 0 .../basic-concepts/async-support.md | 0 .../basic-concepts/getting-started.md | 0 .../basic-concepts/ignite-life-cycel.md | 0 .../documentation/basic-concepts/maven-setup.md | 0 .../basic-concepts/what-is-ignite.md | 0 .../basic-concepts/zero-deployment.md | 0 wiki/documentation/clustering/aws-config.md | 0 wiki/documentation/clustering/cluster-config.md | 0 wiki/documentation/clustering/cluster-groups.md | 0 wiki/documentation/clustering/cluster.md | 0 .../documentation/clustering/leader-election.md | 0 wiki/documentation/clustering/network-config.md | 0 wiki/documentation/clustering/node-local-map.md | 0 .../documentation/compute-grid/checkpointing.md | 0 .../compute-grid/collocate-compute-and-data.md | 0 wiki/documentation/compute-grid/compute-grid.md | 0 .../documentation/compute-grid/compute-tasks.md | 0 .../compute-grid/distributed-closures.md | 0 .../compute-grid/executor-service.md | 0 .../compute-grid/fault-tolerance.md | 0 .../compute-grid/job-scheduling.md | 0 .../compute-grid/load-balancing.md | 0 .../data-grid/affinity-collocation.md | 0 .../data-grid/automatic-db-integration.md | 0 wiki/documentation/data-grid/cache-modes.md | 0 wiki/documentation/data-grid/cache-queries.md | 0 wiki/documentation/data-grid/data-grid.md | 0 wiki/documentation/data-grid/data-loading.md | 0 wiki/documentation/data-grid/evictions.md | 0 .../data-grid/hibernate-l2-cache.md | 0 wiki/documentation/data-grid/jcache.md | 0 wiki/documentation/data-grid/off-heap-memory.md | 0 .../documentation/data-grid/persistent-store.md | 0 wiki/documentation/data-grid/rebalancing.md | 0 wiki/documentation/data-grid/transactions.md | 0 .../data-grid/web-session-clustering.md | 0 .../distributed-data-structures/atomic-types.md | 0 .../countdownlatch.md | 0 .../distributed-data-structures/id-generator.md | 0 .../queue-and-set.md | 0 .../distributed-events/automatic-batching.md | 0 wiki/documentation/distributed-events/events.md | 0 .../distributed-file-system/igfs.md | 0 .../distributed-messaging/messaging.md | 0 wiki/documentation/http/configuration.md | 0 wiki/documentation/http/rest-api.md | 0 .../release-notes/release-notes.md | 0 .../service-grid/cluster-singletons.md | 0 .../service-grid/service-configuration.md | 0 .../service-grid/service-example.md | 0 wiki/documentation/service-grid/service-grid.md | 0 61 files changed, 38 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
