Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-6 ce814ac41 -> c2326312d
Merge branch 'ignite-sprint-4-1.0.6-7.0.6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4-1.0.6-7.0.6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c8d7c91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c8d7c91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c8d7c91 Branch: refs/heads/ignite-sprint-6 Commit: 1c8d7c91ce08640a018efb396e0a0f5a329f02ec Parents: 60c388f 883ad9c Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri May 22 08:00:57 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri May 22 08:00:57 2015 +0300 ---------------------------------------------------------------------- LICENSE | 238 +++++++++++++++++++ LICENSE.txt | 238 ------------------- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/java/META-INF/LICENSE | 238 +++++++++++++++++++ modules/core/src/main/java/META-INF/NOTICE | 12 + .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 1 - pom.xml | 39 ++- 40 files changed, 561 insertions(+), 295 deletions(-) ----------------------------------------------------------------------
