You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/15 15:39:00 UTC
[1/4] ignite git commit: Quick fix to Hadoop IGFS tests NPE.
Repository: ignite
Updated Branches:
refs/heads/master 277b76d7a -> 6e48c9c4f
Quick fix to Hadoop IGFS tests NPE.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/adf5ef61
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/adf5ef61
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/adf5ef61
Branch: refs/heads/master
Commit: adf5ef6100b58beb6fb00d85123f34cb5d9e084a
Parents: 2aa292c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 16:23:10 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 16:23:10 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsAbstractSelfTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/adf5ef61/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 957363f..076c269 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -2686,6 +2686,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
public static void clear(UniversalFileSystemAdapter uni) throws Exception {
IgfsEx igfsEx = uni.getAdapter(IgfsEx.class);
- clear(igfsEx);
+ if (igfsEx != null)
+ clear(igfsEx);
}
}
\ No newline at end of file
[4/4] ignite git commit: Merge branch 'ignite-1.4'
Posted by vo...@apache.org.
Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e48c9c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e48c9c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e48c9c4
Branch: refs/heads/master
Commit: 6e48c9c4f8dca18300aaf168f764b7524e58851c
Parents: 277b76d ae1e1dc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 16:39:27 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 16:39:27 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxHandler.java | 2 +-
.../ignite/internal/processors/igfs/IgfsAbstractSelfTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/4] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e762e25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e762e25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e762e25
Branch: refs/heads/master
Commit: 3e762e25e91f3223fcd2a78bcd80651784e4c32e
Parents: adf5ef6 6e19979
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 16:23:33 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 16:23:33 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 10 +-
.../dht/GridClientPartitionTopology.java | 104 +++++++++++--------
.../dht/GridDhtPartitionTopology.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 7 +-
.../ignite/internal/util/IgniteUtils.java | 16 +++
5 files changed, 87 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
[3/4] ignite git commit: Fixed javadoc.
Posted by vo...@apache.org.
Fixed javadoc.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae1e1dc9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae1e1dc9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae1e1dc9
Branch: refs/heads/master
Commit: ae1e1dc947a10335f79b087950a9c0f964092510
Parents: 3e762e2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 15 16:34:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 15 16:34:22 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae1e1dc9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 756672a..c2cc629 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1049,7 +1049,7 @@ public class IgniteTxHandler {
*
* @param nodeId Node id that originated finish request.
* @param req Request.
- * @param {@code True} if transaction committed on this node.
+ * @param committed {@code True} if transaction committed on this node.
*/
protected void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed) {
if (req.replyRequired()) {