ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [19/21] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Date Wed, 20 May 2015 23:36:43 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5

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/c60ed9b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c60ed9b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c60ed9b1

Branch: refs/heads/ignite-891
Commit: c60ed9b160adc5824dd72839fea24e523a71d512
Parents: c4d81fe cff73bf
Author: avinogradov <avinogradov@gridgain.com>
Authored: Wed May 20 19:22:46 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Wed May 20 19:22:46 2015 +0300

----------------------------------------------------------------------
 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 +++-
 4 files changed, 277 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c60ed9b1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0c6d0ba,26f5456..537b8f9
--- a/pom.xml
+++ b/pom.xml
@@@ -36,8 -36,10 +36,8 @@@
      <packaging>pom</packaging>
  
      <properties>
 -        <ignite.site>scp://localhost:/home</ignite.site>
 -        <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
          <!--fix <attachartifact>...< /> at apache-release profile if changed-->
-         <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
+         <ignite.zip.pattern>${project.artifactId}-${ignite.edition}-${project.version}-bin</ignite.zip.pattern>
      </properties>
  
      <scm>


Mime
View raw message