You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/21 11:04:28 UTC

[1/2] ignite git commit: IGNITE-843 DR minor fixes.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 2df87a87a -> 59a3dcef7


IGNITE-843 DR minor fixes.


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

Branch: refs/heads/ignite-843-rc2
Commit: 5ed89b70d26a997a2392c9d7f7af2a3db31dc589
Parents: e2fa634
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 21 17:04:30 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 21 17:04:30 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/helpers/generator/generator-java.js                | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed89b70/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index dbcdd47..4ec98c1 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -99,6 +99,8 @@ $generatorJava.declareVariable = function (res, varName, varFullType, varFullAct
 
     if (!subClass)
         res.needEmptyLine = true;
+
+    return varName;
 };
 
 /**


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: 59a3dcef7598589361f474450d20cd0f4dfddf04
Parents: 5ed89b7 2df87a8
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 21 17:05:23 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 21 17:05:23 2015 +0700

----------------------------------------------------------------------
 .../configuration/summary/summary.controller.js |  5 ++---
 .../main/js/views/configuration/summary.jade    | 21 +++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------