Merge branch 'ignite-1.6.9' into ignite-1.6.10

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

Branch: refs/heads/ignite-ssl-hotfix
Commit: 5e7ef8644ad824b87d4797e59133eb783ff8b098
Parents: a12298c de50287
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Mon Oct 3 10:37:25 2016 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Mon Oct 3 10:37:25 2016 +0300

----------------------------------------------------------------------
 .../internal/binary/BinaryClassDescriptor.java  |  16 ++-
 .../binary/builder/BinaryObjectBuilderImpl.java |  24 ++--
 .../query/GridCacheQueryMetricsAdapter.java     |  12 +-
 .../cache/VisorCacheResetQueryMetricsTask.java  |  69 +++++++++++
 .../binary/BinaryFieldOrderSelfTest.java        | 115 -------------------
 .../IgniteBinaryObjectsTestSuite.java           |   2 -
 .../CacheAbstractQueryMetricsSelfTest.java      |   6 +-
 7 files changed, 99 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


Reply via email to