ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [01/50] incubator-ignite git commit: # Merge ignite-1121 into 'ignite-1155_1
Date Wed, 05 Aug 2015 01:14:52 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 186591039 -> ebe05e067


# Merge ignite-1121 into 'ignite-1155_1


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

Branch: refs/heads/ignite-843
Commit: 6e9fa455cce1a14caa2d0fa8ed8e2fc60756fb24
Parents: ac83b32 666d44c
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Jul 30 16:07:26 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Jul 30 16:08:31 2015 +0700

----------------------------------------------------------------------
 .../org/apache/ignite/agent/AgentLauncher.java  |  2 +-
 .../src/main/resources/config.properties        | 11 ---------
 .../main/resources/default.config.properties    | 26 ++++++++++++++++++++
 .../src/main/resources/logging.properties       | 15 +++++++++++
 4 files changed, 42 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e9fa455/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
----------------------------------------------------------------------
diff --cc modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
index 725a9d8,0e173d8..c3ba096
--- 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
@@@ -52,9 -51,9 +52,9 @@@ public class AgentLauncher 
      protected static AgentConfiguration getConfiguration(String[] args) throws IOException
{
          AgentConfiguration cfg = new AgentConfiguration();
  
-         URL dfltCfgUrl = AgentLauncher.class.getResource("/config.properties");
 -        URL dftlCfgUrl = AgentLauncher.class.getResource("/default.config.properties");
++        URL dfltCfgUrl = AgentLauncher.class.getResource("/default.config.properties");
  
 -        cfg.load(dftlCfgUrl);
 +        cfg.load(dfltCfgUrl);
  
          AgentCommandLine cmdCfg = new AgentCommandLine();
  


Mime
View raw message