ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject ignite git commit: Corrected marshaller javadoc
Date Wed, 06 Apr 2016 01:45:40 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 3a635ef7b -> fcfbf2c23


Corrected marshaller javadoc


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

Branch: refs/heads/master
Commit: fcfbf2c23aa2ae5773950d34b931272dc5c3b9fe
Parents: 3a635ef
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Tue Apr 5 18:45:34 2016 -0700
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Tue Apr 5 18:45:34 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/marshaller/Marshaller.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fcfbf2c2/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index a76daa8..e99ca35 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@ -19,6 +19,8 @@ package org.apache.ignite.marshaller;
 
 import java.io.InputStream;
 import java.io.OutputStream;
+
+import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteCheckedException;
 import org.jetbrains.annotations.Nullable;
 
@@ -29,7 +31,9 @@ import org.jetbrains.annotations.Nullable;
  * <p>
  * Ignite provides the following {@code Marshaller} implementations:
  * <ul>
- * <li>{@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} - default</li>
+ * <li>Default binary marshaller. Will be used when no other marshaller is explicitly
set to the
+ * configuration. For more information, see {@link IgniteBinary}.</li>
+ * <li>{@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller}</li>
  * <li>{@link org.apache.ignite.marshaller.jdk.JdkMarshaller}</li>
  * </ul>
  * <p>


Mime
View raw message