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/07/10 12:40:34 UTC
[1/2] incubator-ignite git commit: IGNITE-843 WIP changes after
review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 108623c1f -> 3c2cfe555
IGNITE-843 WIP changes after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b84e9cb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b84e9cb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b84e9cb9
Branch: refs/heads/ignite-843
Commit: b84e9cb919a4bafa8d5672e12fc0c27de4d6579f
Parents: 7b18cde
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 10 17:40:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 10 17:40:17 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/models/caches.json | 4 ++--
.../nodejs/controllers/models/clusters.json | 10 +++++++++-
.../nodejs/views/includes/controls.jade | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e9cb9/modules/web-control-center/nodejs/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/caches.json b/modules/web-control-center/nodejs/controllers/models/caches.json
index 7dd32e0..60b8336 100644
--- a/modules/web-control-center/nodejs/controllers/models/caches.json
+++ b/modules/web-control-center/nodejs/controllers/models/caches.json
@@ -126,7 +126,7 @@
"items": "evictionPolicies",
"hide": "backupItem.memoryMode == 'OFFHEAP_TIERED'",
"tip": [
- "Cache expiration policy."
+ "Optional cache eviction policy. Must be set for entries to be evicted from on-heap to off-heap or swap."
],
"details": {
"LRU": {
@@ -287,7 +287,7 @@
]
},
{
- "label": "Cached rows",
+ "label": "On-heap cache for off-heap indexes",
"type": "number",
"model": "sqlOnheapRowCacheSize",
"placeholder": 10240,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e9cb9/modules/web-control-center/nodejs/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/clusters.json b/modules/web-control-center/nodejs/controllers/models/clusters.json
index 8cacf47..76926e5 100644
--- a/modules/web-control-center/nodejs/controllers/models/clusters.json
+++ b/modules/web-control-center/nodejs/controllers/models/clusters.json
@@ -800,7 +800,7 @@
"tip": ["Settings for transactions."],
"fields": [
{
- "label": "Cache concurrency",
+ "label": "Concurrency",
"type": "dropdown",
"path": "transactionConfiguration",
"model": "defaultTxConcurrency",
@@ -852,6 +852,14 @@
]
},
{
+ "label": "Manager lookup",
+ "type": "text",
+ "model": "txManagerLookupClassName",
+ "tip": [
+ "Class name of transaction manager finder for integration for JEE app servers."
+ ]
+ },
+ {
"label": "Enable serializable cache transactions",
"type": "check",
"path": "transactionConfiguration",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b84e9cb9/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index 55a7fcd..6b92910 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -175,8 +175,8 @@ mixin form-row
input.form-control(type='text' ng-model='newValue' ng-focus='field.editIdx = -1' placeholder='{{field.placeholder}}')
div(ng-switch-when='indexedTypes')
- var tblMdl = 'backupItem.indexedTypes'
- div(ng-if="field.label")
- label Indexed types:
+ div
+ label Index key-value type pairs:
+tipLabel('field.tip')
table.links-edit.col-sm-12(st-table=tblMdl ng-show='#{tblMdl}.length > 0')
tbody
[2/2] incubator-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/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3c2cfe55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c2cfe55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c2cfe55
Branch: refs/heads/ignite-843
Commit: 3c2cfe5555f8e79a5d60c118b3beab91e749040c
Parents: b84e9cb 108623c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 10 17:40:31 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 10 17:40:31 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/stylesheets/style.css | 2 +-
.../nodejs/public/stylesheets/style.less | 73 +++++++++++---------
.../web-control-center/nodejs/views/caches.jade | 3 +-
.../nodejs/views/clusters.jade | 3 +-
.../nodejs/views/persistence.jade | 3 +-
.../nodejs/views/summary.jade | 3 +-
.../nodejs/views/templates/layout-sidebar.jade | 21 ++++--
7 files changed, 64 insertions(+), 44 deletions(-)
----------------------------------------------------------------------