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/12/10 08:02:25 UTC
[1/2] ignite git commit: IGNITE-2093 Minor fix
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 6130b8a16 -> 91ffb1939
IGNITE-2093 Minor fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10c975dd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10c975dd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10c975dd
Branch: refs/heads/ignite-843-rc2
Commit: 10c975dd8498278ca0e26bf81241ad8e63f0361f
Parents: f76118a
Author: Andrey <an...@gridgain.com>
Authored: Thu Dec 10 13:54:51 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Dec 10 13:54:51 2015 +0700
----------------------------------------------------------------------
.../js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/10c975dd/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
index 9f4a1db..5601ed8 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
@@ -21,13 +21,13 @@ div
.col-xs-10.col-sm-10.col-md-10.summary-pojo-list
button.select-toggle.form-control(ng-model='ctrl.class' bs-select bs-options='item for item in ctrl.classes' data-container='')
.col-xs-2.col-sm-2.col-md-2
- label
.col-xs-10.col-sm-10.col-md-10
- input(type='checkbox' ng-model='ctrl.useConstructor')
- | Generate constructors
- .col-xs-2.col-sm-2.col-md-2
label
+ input(type='checkbox' ng-model='ctrl.useConstructor')
+ | Generate constructors
+ .col-xs-2.col-sm-2.col-md-2
.col-xs-10.col-sm-10.col-md-10
- input(type='checkbox' ng-model='ctrl.includeKeyFields')
- | Include key fields
+ label
+ input(type='checkbox' ng-model='ctrl.includeKeyFields')
+ | Include key fields
div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91ffb193
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91ffb193
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91ffb193
Branch: refs/heads/ignite-843-rc2
Commit: 91ffb19399638edb4fe06ad471642b1108de2ba2
Parents: 10c975d 6130b8a
Author: Andrey <an...@gridgain.com>
Authored: Thu Dec 10 14:02:20 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Dec 10 14:02:20 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 6 +-
.../ignite/internal/visor/cache/VisorCache.java | 13 ++++
.../internal/visor/query/VisorQueryJob.java | 76 +++++++++++++++++---
.../internal/visor/query/VisorQueryUtils.java | 5 +-
4 files changed, 89 insertions(+), 11 deletions(-)
----------------------------------------------------------------------