Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111
Conflicts:
modules/core/src/test/config/load/mongo-multinode-foster.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/1752d77d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1752d77d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1752d77d
Branch: refs/heads/ignite-57
Commit: 1752d77d99cb4d51a46e9d2c3e309f31e4060ae7
Parents: 507066f
Author: avinogradov <[email protected]>
Authored: Wed Feb 4 17:16:21 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Wed Feb 4 17:16:21 2015 +0300
----------------------------------------------------------------------
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1752d77d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc2d600..2383ceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,8 @@
<exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test
depends on file content-->
<exclude>**/ipc/shmem/*.sh</exclude>
<exclude>**/keystore/generate.sh</exclude>
+ <exclude>**/pom-installed.xml</exclude>
+ <exclude>**/yardstick/**</exclude>
</excludes>
</configuration>
<executions>
@@ -306,7 +308,7 @@
<id>check-license</id>
<phase>validate</phase>
<goals>
- <goal>check</goal>
+ <goal>format</goal>
</goals>
</execution>
</executions>
