You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/02 16:33:46 UTC

[1/2] incubator-ignite git commit: GG-10390

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sprint-5 4f7f58ef7 -> 8719b7351


GG-10390


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

Branch: refs/heads/ignite-sprint-5
Commit: 51ef9a9bdb13d6c20f0ef1a5a3a160abf4cea103
Parents: 45566fe
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 2 17:33:20 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 2 17:33:20 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-visor-console.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51ef9a9b/assembly/dependencies-visor-console.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-visor-console.xml b/assembly/dependencies-visor-console.xml
index 949943d..d773769 100644
--- a/assembly/dependencies-visor-console.xml
+++ b/assembly/dependencies-visor-console.xml
@@ -61,9 +61,6 @@
                             <include>scala-*.jar</include>
                             <include>spring-*.jar</include>
                         </includes>
-                        <excludes>
-                            <exclude>spring-jdbc-*.jar</exclude>
-                        </excludes>
                     </fileSet>
 
                     <fileSet>
@@ -93,6 +90,9 @@
                     <fileSet>
                         <directory>target/libs</directory>
                         <outputDirectory>/visor-common</outputDirectory>
+                        <excludes>
+                            <exclude>spring-jdbc-*.jar</exclude>
+                        </excludes>
                     </fileSet>
 
                     <fileSet>


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5


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

Branch: refs/heads/ignite-sprint-5
Commit: 8719b735123b62e40acedecdce63b361a9f99e6b
Parents: 51ef9a9 4f7f58e
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 2 17:33:41 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 2 17:33:41 2015 +0300

----------------------------------------------------------------------
 .../ignite/cache/eviction/random/RandomEvictionPolicy.java  | 3 ++-
 .../cache/distributed/dht/preloader/GridDhtPreloader.java   | 9 ++++++---
 .../random/RandomEvictionPolicyCacheSizeSelfTest.java       | 6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------