You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/04/15 23:26:49 UTC

[1/2] incubator-trafodion git commit: Change RESTServer node status to report trafodion up/down status

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 9ba333a42 -> f905a745d


Change RESTServer node status to report trafodion up/down status


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/603e0dbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/603e0dbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/603e0dbc

Branch: refs/heads/master
Commit: 603e0dbc78b716be70fac97b73c2a6c1a2c976a2
Parents: 9ba333a
Author: venkat1m <ve...@esgyn.com>
Authored: Thu Apr 14 17:26:10 2016 +0000
Committer: venkat1m <ve...@esgyn.com>
Committed: Thu Apr 14 17:26:10 2016 +0000

----------------------------------------------------------------------
 core/rest/src/main/java/org/trafodion/rest/ServerResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/603e0dbc/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
index 2e2de8a..640a456 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
@@ -333,7 +333,7 @@ public class ServerResource extends ResourceBase {
     private String nodes() throws IOException {
         ScriptContext scriptContext = new ScriptContext();
         scriptContext.setScriptName(Constants.SYS_SHELL_SCRIPT_NAME);
-        scriptContext.setCommand("sqnodestatus json");
+        scriptContext.setCommand("trafnodestatus -j");
 
         try {
             ScriptManager.getInstance().runScript(scriptContext);//This will block while script is running


[2/2] incubator-trafodion git commit: Merge PR 434 Change RESTServer node status

Posted by db...@apache.org.
Merge PR 434 Change RESTServer node status


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

Branch: refs/heads/master
Commit: f905a745d5dfb1af0d3e8bdb91dae329de4abdb6
Parents: 9ba333a 603e0db
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Apr 15 21:25:51 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Apr 15 21:25:51 2016 +0000

----------------------------------------------------------------------
 core/rest/src/main/java/org/trafodion/rest/ServerResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------