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/09/09 16:53:48 UTC
[1/2] ignite git commit: IGNITE-843 Minor token description change.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 3c10128cf -> 83f610d3f
IGNITE-843 Minor token description change.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b745c8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b745c8d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b745c8d
Branch: refs/heads/ignite-843
Commit: 7b745c8d41b0cd4a18a92867da45bcbdcba40401
Parents: f02b9c2
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Sep 9 21:53:10 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Sep 9 21:53:10 2015 +0700
----------------------------------------------------------------------
modules/control-center-agent/README.txt | 4 ++--
.../main/java/org/apache/ignite/agent/AgentConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b745c8d/modules/control-center-agent/README.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt
index 6d8f60c..67d1f36 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -16,7 +16,7 @@ Usage example:
Test drive of Ignite Web Agent:
In order to simplify evaluation two test drive modes were implemented:
- 1) Get access token on Web Control Center "Profile" screen.
+ 1) Get security token on Web Control Center "Profile" screen.
2) Test drive for metadata load from database. Activated by option: -tm or --test-drive-metadata.
In this mode an in-memory H2 database will started.
@@ -74,7 +74,7 @@ Options:
Default: "http://localhost:8080".
-t, --token
- User's access token.
+ User's security token.
-s, --server-uri
URI for connect to Ignite Web Agent, for example: "wss://control-center.example.com:3001".
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b745c8d/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
index 3493dda..04112f6 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
@@ -35,7 +35,7 @@ public class AgentConfiguration {
private static final String DFLT_NODE_URI = "http://localhost:8080";
/** */
- @Parameter(names = {"-t", "--token"}, description = "User's access token")
+ @Parameter(names = {"-t", "--token"}, description = "User's security token")
private String token;
/** */
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@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/83f610d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83f610d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83f610d3
Branch: refs/heads/ignite-843
Commit: 83f610d3ff7cf0f74bff552e3678acd3e808915a
Parents: 7b745c8 3c10128
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Sep 9 21:53:44 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Sep 9 21:53:44 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 21 +++++---------------
.../control-center-web/src/main/js/package.json | 2 +-
.../src/main/js/views/sql/sql.jade | 4 ++--
3 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------