Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into
ignite-sprint-4-1.0.6-7.0.6
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8186e8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8186e8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8186e8e
Branch: refs/heads/ignite-471-2
Commit: f8186e8e35d5c2cd06aafcc9245b9839e2e5e384
Parents: f811f51 cff73bf
Author: avinogradov <avinogra...@gridgain.com>
Authored: Thu May 21 12:03:42 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Thu May 21 12:03:42 2015 +0300
----------------------------------------------------------------------
LICENSE | 238 +++++++++++++++++++++++
LICENSE.txt | 238 -----------------------
NOTICE | 12 ++
NOTICE.txt | 12 --
assembly/release-base.xml | 4 +-
modules/core/src/main/java/META-INF/LICENSE | 238 +++++++++++++++++++++++
modules/core/src/main/java/META-INF/NOTICE | 12 ++
parent/pom.xml | 1 -
pom.xml | 37 +++-
9 files changed, 529 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8186e8e/pom.xml
----------------------------------------------------------------------
