ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [04/41] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121
Date Fri, 31 Jul 2015 02:28:17 GMT
Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121

# Conflicts:
#	modules/web-control-center/src/main/js/package.json


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

Branch: refs/heads/ignite-1121
Commit: f965f6bf7c3c2d7d410c544047bea0d363f3f69f
Parents: 126185f 3e8a935
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Jul 27 08:45:37 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Jul 27 08:45:37 2015 +0700

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/agent/Agent.java  |  5 ++---
 .../org/apache/ignite/agent/AgentCommandLine.java |  2 +-
 .../apache/ignite/agent/messages/AuthMessage.java |  8 ++++----
 .../apache/ignite/agent/messages/AuthResult.java  |  6 +++---
 .../apache/ignite/agent/messages/RestRequest.java |  2 +-
 .../apache/ignite/agent/messages/RestResult.java  |  4 ++--
 .../src/main/js/controllers/caches-controller.js  | 14 ++++++++++++++
 .../main/js/controllers/clusters-controller.js    |  6 ++----
 .../src/main/js/controllers/models/caches.json    | 14 ++++++++++++++
 .../src/main/js/controllers/models/metadata.json  |  8 +++++++-
 modules/web-control-center/src/main/js/db.js      |  2 ++
 .../src/main/js/routes/caches.js                  | 18 ++++++++++++++----
 .../src/main/js/views/includes/controls.jade      |  4 ++--
 13 files changed, 68 insertions(+), 25 deletions(-)
----------------------------------------------------------------------



Mime
View raw message