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/09/11 13:17:56 UTC
[1/2] ignite git commit: # GG-843 Added default properties.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 f931b10b6 -> 75afa7074
# GG-843 Added default properties.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/daa02e9c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/daa02e9c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/daa02e9c
Branch: refs/heads/ignite-843
Commit: daa02e9c3fbbf960d76a829d9dc9d7e557b8a1ec
Parents: 4abfd55
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 18:18:31 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 18:18:31 2015 +0700
----------------------------------------------------------------------
.../main/java/org/apache/ignite/agent/AgentLauncher.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/daa02e9c/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
index e2942d4..09effa0 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
@@ -19,6 +19,7 @@ package org.apache.ignite.agent;
import com.beust.jcommander.JCommander;
import java.io.File;
+import java.io.IOException;
import java.net.URI;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -73,6 +74,14 @@ public class AgentLauncher {
if (cmdCfg.configPath() != null)
cfg.load(new File(cmdCfg.configPath()).toURI().toURL());
+ else {
+ try {
+ cfg.load(new File("./default.properties").toURI().toURL());
+ }
+ catch (IOException ignore) {
+ // No-op.
+ }
+ }
cfg.merge(cmdCfg);
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75afa707
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75afa707
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75afa707
Branch: refs/heads/ignite-843
Commit: 75afa70742233683dfee9f6fcba317698f756d78
Parents: daa02e9 f931b10
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 18:18:46 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 18:18:46 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 38 +++++++++++++-------
.../src/main/js/controllers/common-module.js | 6 ++--
.../js/views/templates/validation-error.jade | 8 +++--
3 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------