ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/3] ignite git commit: Merge branch 'ignite-1.4'
Date Mon, 07 Sep 2015 13:36:33 GMT
Merge branch 'ignite-1.4'

Conflicts:
	parent/pom.xml


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

Branch: refs/heads/master
Commit: 99187cf8fa3499cd0e510481c4148626c7859622
Parents: 5f01d00 1fe7e95
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Sep 7 16:36:53 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Sep 7 16:36:53 2015 +0300

----------------------------------------------------------------------
 .../cache/IgniteDaemonNodeMarshallerCacheTest.java        | 10 ++++++++++
 parent/pom.xml                                            |  1 +
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/99187cf8/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 846211b,015d92f..f5a29cb
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -749,23 -748,11 +749,24 @@@
                                          <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar</exclude>
                                          <exclude>**/Makefile.am</exclude>
                                          <exclude>**/configure.ac</exclude>
 +                                        <exclude>**/*.pc.in</exclude>
+                                         <exclude>**/*.sln</exclude>
                                          <exclude>**/*.vcxproj</exclude>
 +                                        <exclude>**/*.vcxprojrel</exclude>
                                          <exclude>**/*.vcxproj.filters</exclude>
 +                                        <exclude>**/*.sln</exclude>
 +                                        <exclude>**/*.slnrel</exclude>
 +                                        <exclude>**/*.opensdf</exclude>
                                          <exclude>**/module.def</exclude>
                                          <exclude>**/ignite-common.pc.in</exclude>
 +                                        <exclude>**/*.csproj</exclude>
 +                                        <exclude>**/*.fxcop</exclude>
 +                                        <exclude>**/*.metaproj</exclude>
 +                                        <exclude>**/*.metaproj.tmp</exclude>
 +                                        <exclude>**/x64/Debug/**</exclude>
 +                                        <exclude>**/teamcity_boost.cpp</exclude>
 +                                        <exclude>**/teamcity_messages.h</exclude>
 +                                        <exclude>**/teamcity_messages.cpp</exclude>
                                      </excludes>
                                  </configuration>
                              </execution>


Mime
View raw message