ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Minor fix.
Date Wed, 25 Nov 2015 11:31:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 f5da1605a -> 2f6de8a8e


IGNITE-843 Minor fix.


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

Branch: refs/heads/ignite-843-rc1
Commit: 2f6de8a8ec1bae65c4abee06b9d4bce74acafca7
Parents: f5da160
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Nov 25 18:30:58 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Nov 25 18:30:58 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/models/caches.json          | 12 ++++++++----
 .../src/main/js/gulpfile.js/tasks/copy.js               |  1 +
 .../src/main/js/views/includes/controls.jade            |  4 +---
 3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2f6de8a8/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 7c40aba..bf3e81e 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -159,12 +159,16 @@
             "<ul>",
             "  <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>",
+            "      <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>",
+            "  <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>"
           ]
         },

http://git-wip-us.apache.org/repos/asf/ignite/blob/2f6de8a8/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
index 04a144f..fb9dff5 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
@@ -34,6 +34,7 @@ var paths = [
 var igniteModulePaths = [
     igniteModules + '/**/main.js',
     igniteModules + '/**/controllers/*.js',
+    igniteModules + '/**/generator/*.js',
     igniteModules + '/**/controllers/models/*.json'
 ];
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2f6de8a8/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index ce9760b..ec78928 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -357,7 +357,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
                 .input-tip
                     button.select-toggle.form-control(id='{{::field.id}}' bs-select data-placeholder='{{::field.placeholder}}'
bs-options='item.value as item.label for item in {{field.items}}' ng-attr-data-container='{{::field.container}}'
tabindex='0')&attributes(fieldCommon)&attributes(dropdownPlaceholder)&attributes(fieldDisabled)
         div(ng-switch-when='dropdown-multiple' ng-hide=fieldHide)
-            dic(class=lblClasses)
+            div(class=lblClasses)
                 label(ng-class=fieldRequiredClass) {{::field.label}}:
                 a.customize(ng-if='field.addLink' ng-href='{{field.addLink.ref}}&id={{backupItem._id}}')
(add)
             div(class=fieldClasses)
@@ -417,8 +417,6 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             +table-pair('Index key-value type pairs', fieldMdl, 'keyClass', 'valueClass',
'Key full class name', 'Value class full name', true, true, '/')
         div(ng-switch-when='fields' ng-hide=fieldHide)
             +table-pair('{{::field.label}}', fieldMdl, 'name', 'className', 'Field name',
'Field full class name', false, true, '/')
-        .group-section(ng-switch-when='aliases' ng-hide=fieldHide)
-            +table-pair('{{::field.label}}', fieldMdl, 'field', 'alias', 'Field name', 'Field
Alias', false, false, '->')
         .group-section(ng-switch-when='pathModes' ng-hide=fieldHide)
             +table-igfs-path-mode('{{::field.label}}', fieldMdl, 'path', 'mode', 'Path',
'Mode')
         .group-section(ng-switch-when='table-db-fields' ng-hide=fieldHide)


Mime
View raw message