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/12/29 07:19:31 UTC

[1/4] ignite git commit: Add Camel Streamer and OSGi to release notes.

Repository: ignite
Updated Branches:
  refs/heads/ignite-2258 96b0e235f -> 23529ac46


Add Camel Streamer and OSGi to release notes.


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

Branch: refs/heads/ignite-2258
Commit: 156e7879eeff34ec7ee5256dac6adb91c9b4fc9b
Parents: 46b8f01
Author: Raul Kripalani <ra...@apache.org>
Authored: Mon Dec 28 13:30:44 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Mon Dec 28 13:30:53 2015 +0000

----------------------------------------------------------------------
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/156e7879/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index b0822c9..2e9625e 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -11,6 +11,8 @@ Apache Ignite In-Memory Data Fabric 1.5
 * Added MQTT Streamer.
 * Added Twitter Streamer.
 * Added Ignite Sink (integration with Apache Flume).
+* Added Apache Camel Streamer.
+* Added OSGi support.
 * Fixed optimistic serializable transactions: implemented "deadlock-free" locking algorithm.
 * Fixed failover for continuous queries.
 * Fixed compilation and runtime errors under OpenJDK and IBM JDK.


[2/4] ignite git commit: RAT fix

Posted by vo...@apache.org.
RAT fix


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

Branch: refs/heads/ignite-2258
Commit: f97dc9fe399792ff81fc936a47704c6d62656bd8
Parents: 156e787
Author: Anton Vinogradov <av...@apache.org>
Authored: Mon Dec 28 17:15:59 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Dec 28 17:15:59 2015 +0300

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f97dc9fe/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b7b417b..4497d01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -826,7 +826,7 @@
                                         <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
                                         <!--special excludes-->
                                         <exclude>idea/ignite_codeStyle.xml</exclude>
-                                        <exclude>DEVNOTES.txt</exclude>
+                                        <exclude>**/DEVNOTES.txt</exclude>
                                         <exclude>**/NOTICE*</exclude>
                                         <exclude>**/LICENSE*</exclude>
                                         <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->


[4/4] ignite git commit: IGNITE-2258: Minor changes to documentation.

Posted by vo...@apache.org.
IGNITE-2258: Minor changes to documentation.


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

Branch: refs/heads/ignite-2258
Commit: 23529ac46300cbf1c136aa8982102fa408794f7a
Parents: ce6900c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Dec 29 09:20:27 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Dec 29 09:20:27 2015 +0300

----------------------------------------------------------------------
 .../configuration/FileSystemConfiguration.java  | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/23529ac4/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index acdf5da..3a9e55e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -526,13 +526,14 @@ public class FileSystemConfiguration {
      * If path doesn't correspond to any specified prefix or mappings are not provided, then
      * {@link #getDefaultMode()} is used.
      * <p>
-     * Several folders under {@code '/apache/ignite'} folder have predefined mappings which cannot be overridden.
-     * <li>{@code /apache/ignite/primary} and all it's sub-folders will always work in {@code PRIMARY} mode.</li>
+     * If {@link #isInitializeDefaultPathsModes()} is set to {@code true}, the following path modes will be created
+     * by default:
+     * <li>{@code /ignite/primary} and all it's sub-folders will always work in {@code PRIMARY} mode.</li>
      * <p>
      * And in case secondary file system URI is provided:
-     * <li>{@code /apache/ignite/proxy} and all it's sub-folders will always work in {@code PROXY} mode.</li>
-     * <li>{@code /apache/ignite/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li>
-     * <li>{@code /apache/ignite/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li>
+     * <li>{@code /ignite/proxy} and all it's sub-folders will always work in {@code PROXY} mode.</li>
+     * <li>{@code /ignite/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li>
+     * <li>{@code /ignite/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li>
      *
      * @return Map of paths to {@code IGFS} modes.
      */
@@ -801,9 +802,12 @@ public class FileSystemConfiguration {
      * When set to {@code true} Ignite will automatically create the following path modes:
      * <ul>
      *     <li>{@code /ignite/primary} - will work in {@link IgfsMode#PRIMARY} mode;</li>
-     *     <li>{@code /ignite/sync} - will work in {@link IgfsMode#DUAL_SYNC} mode;</li>
-     *     <li>{@code /ignite/async} - will work in {@link IgfsMode#DUAL_ASYNC} mode;</li>
-     *     <li>{@code /ignite/proxy} - will work in {@link IgfsMode#PROXY} mode;</li>
+     *     <li>{@code /ignite/sync} - will work in {@link IgfsMode#DUAL_SYNC} mode (only if secondary file system
+     *         is set);</li>
+     *     <li>{@code /ignite/async} - will work in {@link IgfsMode#DUAL_ASYNC} mode (only if secondary file system
+     *         is set);</li>
+     *     <li>{@code /ignite/proxy} - will work in {@link IgfsMode#PROXY} mode (only if secondary file system
+     *         is set).</li>
      * </ul>
      * See {@link #getPathModes()} for more information about path modes.
      * <p>


[3/4] ignite git commit: Merge branch 'ignite-1.5' into ignite-2258

Posted by vo...@apache.org.
Merge branch 'ignite-1.5' into ignite-2258


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

Branch: refs/heads/ignite-2258
Commit: ce6900cbf4baa5301727c0108a2c55ed5414b59f
Parents: 96b0e23 f97dc9f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Dec 29 09:16:09 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Dec 29 09:16:09 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt | 2 ++
 parent/pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------