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/11/20 08:14:24 UTC
[1/2] ignite git commit: IGNITE-843 Support for ignite_modules.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 f639220cf -> aa85ee8ce
IGNITE-843 Support for ignite_modules.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f05b76e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f05b76e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f05b76e5
Branch: refs/heads/ignite-843-rc1
Commit: f05b76e50f396b52c0e3c1b0fdc4c4c1b9f05f7a
Parents: 1b5bfce
Author: Andrey <an...@gridgain.com>
Authored: Fri Nov 20 14:13:57 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Nov 20 14:13:57 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f05b76e5/modules/control-center-web/src/main/js/app.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app.js b/modules/control-center-web/src/main/js/app.js
index 5a3c346..bf3c659 100644
--- a/modules/control-center-web/src/main/js/app.js
+++ b/modules/control-center-web/src/main/js/app.js
@@ -163,7 +163,7 @@ function find(root, filter, files, prefix) {
return files;
}
-var igniteModules = path.resolve(__dirname, 'ignite_modules');
+var igniteModules = process.env.IGNITE_MODULES || path.resolve(__dirname, 'ignite_modules');
find(igniteModules)
.filter(function(path) { return path.match(/\/routes\/.+\.js$/); })
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa85ee8c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa85ee8c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa85ee8c
Branch: refs/heads/ignite-843-rc1
Commit: aa85ee8ce6c9651c0acf6d9c8528b3057ae113f4
Parents: f05b76e f639220
Author: Andrey <an...@gridgain.com>
Authored: Fri Nov 20 14:14:18 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Nov 20 14:14:18 2015 +0700
----------------------------------------------------------------------
.../main/js/helpers/generator/generator-java.js | 41 +++++++++++++-------
1 file changed, 26 insertions(+), 15 deletions(-)
----------------------------------------------------------------------