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/06/19 05:56:07 UTC
[1/3] incubator-ignite git commit: # IGNITE-843 Fixed tooltip.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 52b4244d5 -> bfcea3393
# IGNITE-843 Fixed tooltip.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37cf3b0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37cf3b0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37cf3b0b
Branch: refs/heads/ignite-843
Commit: 37cf3b0bb2ed5d2cce8d1251715f6eba6c898c94
Parents: 52b4244
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 19 10:53:48 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 19 10:53:48 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/public/form-models/caches.json | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37cf3b0b/modules/webconfig/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json
index 5642f8c..33470d0 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -59,9 +59,14 @@
"tip": [
"Memory modes:",
"<ul>",
- " <li>ONHEAP_TIERED - in this mode entries will be stored on-heap first.</li>",
- " <li>OFFHEAP_TIERED - distributed caches will start immediately and will load all necessary data from other available grid nodes in the background.</li>",
- " <li>OFFHEAP_VALUES - in this mode no rebalancing will take place which means that caches will be either loaded on demand from persistent store whenever data is accessed, or will be populated explicitly.</li>",
+ " <li>ONHEAP_TIERED - entries are cached on heap memory first.",
+ " <ul>",
+ " <li>If offheap memory is enabled and eviction policy evicts an entry from heap memory, entry will be moved to offheap memory. If offheap memory is disabled, then entry is simply discarded.</li>",
+ " <li>If swap space is enabled and offheap memory fills up, then entry will be evicted into swap space. If swap space is disabled, then entry will be discarded. If swap is enabled and offheap memory is disabled, then entry will be evicted directly from heap memory into swap.</li>",
+ " </ul>",
+ " </li>",
+ " <li>OFFHEAP_TIERED - works the same as ONHEAP_TIERED, except that entries never end up in heap memory and get stored in offheap memory right away. Entries get cached in offheap memory first and then get evicted to swap, if one is configured.</li>",
+ " <li>OFFHEAP_VALUES - entry keys will be stored on heap memory, and values will be stored in offheap memory. Note that in this mode entries can be evicted only to swap.</li>",
"</ul>"
]
},
[3/3] incubator-ignite git commit: # IGNITE-843 Fixed logon error
message.
Posted by ak...@apache.org.
# IGNITE-843 Fixed logon error message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bfcea339
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bfcea339
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bfcea339
Branch: refs/heads/ignite-843
Commit: bfcea3393a5cd97e437853cf8b7c9c2e1027b15b
Parents: d422b8b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 19 10:55:40 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 19 10:55:40 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/routes/auth.js | 2 +-
modules/webconfig/nodejs/views/includes/controls.jade | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfcea339/modules/webconfig/nodejs/routes/auth.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/auth.js b/modules/webconfig/nodejs/routes/auth.js
index 06240bf..5ed7278 100644
--- a/modules/webconfig/nodejs/routes/auth.js
+++ b/modules/webconfig/nodejs/routes/auth.js
@@ -51,7 +51,7 @@ router.post('/login', function(req, res, next) {
return res.status(401).send(err.message);
if (!user)
- return res.status(401).send('Account with this email not exist.');
+ return res.status(401).send('Invalid email or password');
req.logIn(user, {}, function(err) {
if (err)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfcea339/modules/webconfig/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade
index 9b4748e..fd288b7 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -148,7 +148,7 @@ mixin form-row
tr.col-sm-12(ng-repeat='item in #{tblMdl}')
td.col-sm-6
div(ng-show='field.editIdx != {{$index}}')
- a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item.keyClass}}, {{item.valueClass}}
+ a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item.keyClass}} / {{item.valueClass}}
i.tipField.fa.fa-remove(ng-click='field.editIdx = -1; #{tblMdl}.splice($index, 1)')
div(ng-show='field.editIdx == {{$index}}')
label.labelField {{$index + 1}}.
[2/3] incubator-ignite git commit: # IGNITE-843 Cache template
removed.
Posted by ak...@apache.org.
# IGNITE-843 Cache template removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d422b8b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d422b8b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d422b8b1
Branch: refs/heads/ignite-843
Commit: d422b8b1d8c2253cb6178dc73fd32dcbe3c4f069
Parents: 37cf3b0
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 19 10:54:50 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 19 10:54:50 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/javascripts/controllers/caches.js | 9 +--------
modules/webconfig/nodejs/views/caches.jade | 4 +---
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d422b8b1/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index 83dd8b4..b5a048b 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -20,12 +20,6 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
$scope.addDetailSimpleItem = commonFunctions.addDetailSimpleItem;
$scope.swapSimpleItems = commonFunctions.swapSimpleItems;
- $scope.templates = [
- {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'}, label: 'partitioned'},
- {value: {mode: 'REPLICATED', atomicityMode: 'ATOMIC'}, label: 'replicated'},
- {value: {mode: 'LOCAL', atomicityMode: 'ATOMIC'}, label: 'local'}
- ];
-
$scope.atomicities = [
{value: 'ATOMIC', label: 'ATOMIC'},
{value: 'TRANSACTIONAL', label: 'TRANSACTIONAL'}
@@ -87,8 +81,7 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
// Add new cache.
$scope.createItem = function() {
- $scope.backupItem = angular.copy($scope.create.template);
-
+ $scope.backupItem = {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'};
$scope.backupItem.space = $scope.spaces[0]._id;
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d422b8b1/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index 6e42936..eb47351 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -33,9 +33,7 @@ block content
tr(ng-repeat='row in caches track by row._id')
td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
a(ng-click='selectItem(row)') {{$index + 1}}. {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}}
- button(ng-click='createItem()' class=['btn', 'btn-primary'] ng-disabled='!create.template')  Add cache
- span(style='margin-left: 15px; margin-right: 5px') Use template: 
- button.btn.btn-default(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cache template' bs-options='item.value as item.label for item in templates' bs-select)
+ button.btn.btn-primary(ng-click='createItem()') Add cache
hr
form.form-horizontal(name='cachesForm' ng-if='backupItem')
div(bs-collapse data-start-collapsed='false')