You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/03/02 15:45:18 UTC

[1/3] incubator-ignite git commit: # ignite-270 Fixed scaladoc link.

Repository: incubator-ignite
Updated Branches:
  refs/heads/sprint-2 235758cd9 -> 028e44637


# ignite-270 Fixed scaladoc link.


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

Branch: refs/heads/sprint-2
Commit: 18548b256510938e597a6ecd69be3f0d01a6bb6e
Parents: 12ee896
Author: anovikov <an...@gridgain.com>
Authored: Wed Feb 25 22:18:30 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Wed Feb 25 22:18:30 2015 +0700

----------------------------------------------------------------------
 modules/scalar/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18548b25/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index c38085c..ff98212 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -166,6 +166,12 @@
                                     <include name="**/index.js"/>
                                 </replace>
 
+                                <replace dir="target/site/scaladocs">
+                                    <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken>
+                                    <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue>
+                                    <fileset dir="target/site/scaladocs"/>
+                                </replace>
+
                                 <replaceregexp byline="true" flags="im" encoding="UTF-8">
                                     <regexp pattern='(&lt;dt&gt;Attributes&lt;/dt&gt;&lt;dd&gt;protected\[)&lt;a.+&gt;(.+)&lt;/a&gt;(\]\s+&lt;/dd&gt;)'/>
                                     <substitution expression="\1\2\3"/>


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

Posted by an...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/sprint-2
Commit: 028e44637fe9ff3fe3347d685f7d52422ff1cb0d
Parents: 2511ebe 235758c
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 21:44:49 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 21:44:49 2015 +0700

----------------------------------------------------------------------
 .../core/src/main/java/org/apache/ignite/IgniteCluster.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[2/3] incubator-ignite git commit: Merge branch 'ignite-270' into sprint-2

Posted by an...@apache.org.
Merge branch 'ignite-270' into sprint-2


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

Branch: refs/heads/sprint-2
Commit: 2511ebe18c564e43e642bc879ffe44b02497c90a
Parents: b0e6ab1 18548b2
Author: anovikov <an...@gridgain.com>
Authored: Mon Mar 2 21:43:59 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Mon Mar 2 21:43:59 2015 +0700

----------------------------------------------------------------------
 modules/scalar/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2511ebe1/modules/scalar/pom.xml
----------------------------------------------------------------------