Merge remote-tracking branch 'remotes/origin/master' into ignite-5075-cacheStart


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

Branch: refs/heads/ignite-5075
Commit: 11fc7ca85e5f37ef0d57e08cd8c18951929e7574
Parents: ace34f2 a0fc6ee
Author: sboikov <sboi...@gridgain.com>
Authored: Wed May 17 18:19:26 2017 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Wed May 17 18:19:26 2017 +0300

----------------------------------------------------------------------
 assembly/LICENSE_FABRIC                         |  2 +-
 assembly/LICENSE_HADOOP                         |  2 +-
 .../managers/communication/GridIoManager.java   | 68 ++++++++++++----
 .../processors/hadoop/HadoopClasspathUtils.java |  3 +-
 modules/hadoop/pom.xml                          |  2 +-
 .../ignite/impl/binary/binary_type_manager.h    |  6 +-
 .../src/impl/binary/binary_type_manager.cpp     | 83 +++++++++-----------
 .../cpp/core-test/src/cache_query_test.cpp      | 22 ++++++
 .../core/include/ignite/cache/query/query_sql.h |  8 ++
 .../ignite/cache/query/query_sql_fields.h       | 10 ++-
 .../query-example/src/query_example.cpp         |  6 +-
 .../Cache/MemoryMetricsTest.cs                  | 14 ++--
 .../frontend/gulpfile.babel.js/tasks/bundle.js  |  2 +-
 .../webpack/environments/development.js         |  5 +-
 14 files changed, 149 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


Reply via email to