ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [12/12] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4436-2
Date Thu, 09 Feb 2017 10:05:35 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4436-2


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

Branch: refs/heads/ignite-4436-2
Commit: 6da54da7b889b483cecc1e0e6ed3ec50fa81e588
Parents: 6de0391 e7a5307
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Feb 9 17:02:51 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Feb 9 17:02:51 2017 +0700

----------------------------------------------------------------------
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../processors/cache/GridCacheProcessor.java    |  85 +++++++
 .../distributed/dht/GridDhtCacheAdapter.java    |  10 +-
 .../distributed/dht/GridDhtLocalPartition.java  | 120 ++++++++--
 .../internal/processors/job/GridJobWorker.java  |   4 +
 .../processors/query/GridQueryProcessor.java    |   9 +
 .../internal/GridContinuousTaskSelfTest.java    |  79 +++++++
 .../cache/CacheDeferredDeleteQueueTest.java     | 134 +++++++++++
 ...CacheAtomicReferenceApiSelfAbstractTest.java |  60 ++++-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |  59 +++++
 .../GridCacheQueueApiSelfAbstractTest.java      |  58 +++++
 .../GridCacheSetAbstractSelfTest.java           |  53 +++++
 .../IgniteAtomicLongApiAbstractSelfTest.java    |  27 +++
 .../IgniteCountDownLatchAbstractSelfTest.java   |  43 ++++
 .../IgniteLockAbstractSelfTest.java             |  54 ++++-
 .../IgniteSemaphoreAbstractSelfTest.java        |  52 ++++-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../cache/QueryEntityCaseMismatchTest.java      | 107 +++++++++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../Apache.Ignite.Examples.csproj               |   1 +
 .../Datagrid/TransactionExample.cs              |  75 ++++--
 modules/web-console/backend/app/agent.js        |  10 +-
 modules/web-console/backend/app/mongo.js        |  49 ++--
 modules/web-console/backend/app/routes.js       |   5 +-
 .../web-console/backend/routes/activities.js    |  52 +++++
 modules/web-console/backend/routes/admin.js     |   2 +-
 modules/web-console/backend/routes/agent.js     |  10 +-
 modules/web-console/backend/routes/public.js    |   1 -
 .../web-console/backend/services/activities.js  | 136 +++++++++++
 modules/web-console/backend/services/users.js   |  13 +-
 modules/web-console/frontend/app/app.config.js  |   9 +
 modules/web-console/frontend/app/app.js         |  29 ++-
 .../activities-user-dialog.controller.js        |  60 +++++
 .../activities-user-dialog.jade                 |  36 +++
 .../components/activities-user-dialog/index.js  |  36 +++
 .../form-field-datepicker.jade                  |  55 +++++
 .../form-field-datepicker.scss                  |  20 ++
 .../list-of-registered-users/index.js           |  28 +++
 .../list-of-registered-users.categories.js      |  30 +++
 .../list-of-registered-users.column-defs.js     |  80 +++++++
 .../list-of-registered-users.controller.js      | 207 ++++++++++++++++
 .../list-of-registered-users.jade               |  54 +++++
 .../ui-grid-header/ui-grid-header.jade          |  27 +++
 .../ui-grid-header/ui-grid-header.scss          |  84 +++++++
 .../ui-grid-settings/ui-grid-settings.jade      |  33 +++
 .../ui-grid-settings/ui-grid-settings.scss      |  70 ++++++
 .../app/core/activities/Activities.data.js      |  39 ++++
 .../frontend/app/core/admin/Admin.data.js       |  77 ++++++
 modules/web-console/frontend/app/core/index.js  |  25 ++
 modules/web-console/frontend/app/data/i18n.js   |  38 +++
 .../ui-grid-settings/ui-grid-settings.jade      |  33 ---
 .../ui-grid-settings/ui-grid-settings.scss      |  38 ---
 .../app/filters/uiGridSubcategories.filter.js   |  24 ++
 .../frontend/app/modules/Demo/Demo.module.js    | 166 -------------
 .../frontend/app/modules/demo/Demo.module.js    | 172 ++++++++++++++
 .../frontend/app/modules/sql/sql.controller.js  |  14 +-
 .../frontend/app/modules/sql/sql.module.js      |   2 +-
 .../frontend/app/modules/states/admin.state.js  |   2 +-
 .../configuration/summary/summary.controller.js |   6 +-
 .../app/modules/user/AclRoute.provider.js       |  31 +--
 .../frontend/app/modules/user/Auth.service.js   |   2 +-
 .../frontend/app/modules/user/permissions.js    |   2 +-
 .../frontend/app/modules/user/user.module.js    |   6 +-
 modules/web-console/frontend/app/vendor.js      |   1 +
 .../frontend/controllers/admin-controller.js    | 234 -------------------
 .../frontend/controllers/domains-controller.js  |  12 +-
 modules/web-console/frontend/package.json       |   1 +
 .../stylesheets/_font-awesome-custom.scss       |  28 +++
 .../frontend/public/stylesheets/style.scss      |  39 +++-
 .../frontend/public/stylesheets/variables.scss  |   1 +
 .../frontend/views/settings/admin.jade          |  32 +--
 modules/web-console/frontend/views/sql/sql.jade |   4 +-
 .../cache/IgnitePutRemoveBenchmark.java         |  42 ++++
 .../cache/IgnitePutRemoveTxBenchmark.java       |  30 +++
 74 files changed, 2660 insertions(+), 614 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6da54da7/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------


Mime
View raw message