Merge branch 'gridgain-7.6.1' of https://github.com/gridgain/apache-ignite


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

Branch: refs/heads/ignite-1232
Commit: 848b027db6ef4c45ac0602651f050d2b9f69adf9
Parents: f238b76 f177d43
Author: Alexey Kuznetsov <[email protected]>
Authored: Tue Jun 21 14:31:20 2016 +0700
Committer: Alexey Kuznetsov <[email protected]>
Committed: Tue Jun 21 14:31:20 2016 +0700

----------------------------------------------------------------------
 .../client/ClientDefaultCacheSelfTest.java      | 119 ++-
 .../ignite/internal/client/ClientHttpTask.java  |  33 +-
 .../ignite/internal/client/ClientTcpTask.java   |  10 +-
 .../integration/ClientAbstractSelfTest.java     |  92 +-
 .../JettyRestProcessorAbstractSelfTest.java     | 985 ++++++++-----------
 .../internal/processors/rest/SimplePerson.java  |  74 ++
 modules/core/pom.xml                            |  15 +-
 .../apache/ignite/internal/LessNamingBean.java  |  28 +
 .../cache/query/GridCacheSqlIndexMetadata.java  |   3 +-
 .../cache/query/GridCacheSqlMetadata.java       |   3 +-
 .../internal/util/IgniteExceptionRegistry.java  |   5 +-
 .../ignite/internal/visor/cache/VisorCache.java |   4 +-
 .../cache/VisorCacheAffinityConfiguration.java  |   5 +-
 .../cache/VisorCacheAggregatedMetrics.java      |   3 +-
 .../visor/cache/VisorCacheConfiguration.java    |   3 +-
 .../cache/VisorCacheDefaultConfiguration.java   |   5 +-
 .../cache/VisorCacheEvictionConfiguration.java  |   5 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   3 +-
 .../cache/VisorCacheNearConfiguration.java      |   5 +-
 .../visor/cache/VisorCachePartition.java        |   3 +-
 .../visor/cache/VisorCachePartitions.java       |   3 +-
 .../cache/VisorCacheQueryConfiguration.java     |   3 +-
 .../visor/cache/VisorCacheQueryMetrics.java     |   5 +-
 .../cache/VisorCacheRebalanceConfiguration.java |   5 +-
 .../cache/VisorCacheStoreConfiguration.java     |   3 +-
 .../cache/VisorCacheTypeFieldMetadata.java      |   3 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |   3 +-
 .../internal/visor/cache/VisorCacheV4.java      | 124 +++
 .../internal/visor/debug/VisorThreadInfo.java   |   5 +-
 .../visor/debug/VisorThreadLockInfo.java        |   5 +-
 .../internal/visor/event/VisorGridEvent.java    |   5 +-
 .../internal/visor/file/VisorFileBlock.java     |   5 +-
 .../ignite/internal/visor/igfs/VisorIgfs.java   |   5 +-
 .../internal/visor/igfs/VisorIgfsEndpoint.java  |   5 +-
 .../internal/visor/igfs/VisorIgfsMetrics.java   |   5 +-
 .../visor/igfs/VisorIgfsProfilerEntry.java      |   5 +-
 .../VisorIgfsProfilerUniformityCounters.java    |   5 +-
 .../visor/log/VisorLogSearchResult.java         |   5 +-
 .../visor/node/VisorAtomicConfiguration.java    |   5 +-
 .../visor/node/VisorBasicConfiguration.java     |   5 +-
 .../node/VisorExecutorServiceConfiguration.java |   5 +-
 .../visor/node/VisorGridConfiguration.java      |   5 +-
 .../visor/node/VisorIgfsConfiguration.java      |   3 +-
 .../visor/node/VisorLifecycleConfiguration.java |   5 +-
 .../visor/node/VisorMetricsConfiguration.java   |   5 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  26 +-
 .../node/VisorNodeDataCollectorTaskResult.java  |   5 +-
 .../node/VisorPeerToPeerConfiguration.java      |   5 +-
 .../visor/node/VisorRestConfiguration.java      |   5 +-
 .../node/VisorSegmentationConfiguration.java    |   5 +-
 .../visor/node/VisorSpisConfiguration.java      |   5 +-
 .../node/VisorTransactionConfiguration.java     |   5 +-
 .../internal/visor/query/VisorQueryField.java   |   5 +-
 .../internal/visor/query/VisorQueryResult.java  |   5 +-
 .../plugin/security/SecurityPermissionSet.java  |   5 +-
 .../ignite/plugin/security/SecuritySubject.java |   5 +-
 modules/rest-http/pom.xml                       |  25 +-
 .../http/jetty/GridJettyJsonConfig.java         | 317 ------
 .../http/jetty/GridJettyObjectMapper.java       | 259 +++++
 .../http/jetty/GridJettyRestHandler.java        | 127 ++-
 parent/pom.xml                                  |   1 +
 61 files changed, 1277 insertions(+), 1163 deletions(-)
----------------------------------------------------------------------


Reply via email to