Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6a6b64c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6a6b64c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6a6b64c

Branch: refs/heads/ignite-639
Commit: e6a6b64c6731ba6568e74bf1534d64200c46e80e
Parents: 0a8378c f2b40c1
Author: avinogradov <avinogra...@gridgain.com>
Authored: Mon Apr 6 20:20:41 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Mon Apr 6 20:20:41 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/util/IgniteUtils.java       | 46 ++++++++++++++++++--
 modules/schedule/pom.xml                        | 20 +++++++++
 pom.xml                                         |  2 +-
 3 files changed, 63 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e6a6b64c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 16a2cb0,92a85a7..e1e292c
--- a/pom.xml
+++ b/pom.xml
@@@ -508,9 -497,9 +508,9 @@@
                              <failOnError>false</failOnError>
                              <fileSets>
                                  <fileSet>
-                                     <directory>target</directory>
+                                     <directory>${basedir}/target</directory>
                                      <includes>
 -                                        
<include>ignite-${project.version}-source-release.zip</include>
 +                                        
<include>${project.artifactId}-${project.version}-source-release.zip</include>
                                      </includes>
                                  </fileSet>
                              </fileSets>

Reply via email to