Merge remote-tracking branch 'origin/web-console-staging' into ignite-3262
Conflicts:
modules/web-console/src/main/js/app/services/JavaTypes.service.js
modules/web-console/src/main/js/app/vendor.js
modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js
modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
modules/web-console/src/main/js/gulpfile.babel.js/tasks/sass.js
modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
modules/web-console/src/main/js/package.json
modules/web-console/src/main/js/serve/errors/DuplicateKeyException.js
modules/web-console/src/main/js/serve/middlewares/api.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/573b5a67
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/573b5a67
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/573b5a67
Branch: refs/heads/ignite-3262
Commit: 573b5a67307adbbb7cf95fd0296ab7b8223ff872
Parents: 7699bc9 2579aba
Author: Maxim Afanasiev <[email protected]>
Authored: Tue Jun 28 15:48:26 2016 +0700
Committer: Maxim Afanasiev <[email protected]>
Committed: Tue Jun 28 15:48:26 2016 +0700
----------------------------------------------------------------------
.../configuration/HadoopConfiguration.java | 35 +++
.../org/apache/ignite/internal/IgnitionEx.java | 3 +
.../processors/cache/GridCacheAdapter.java | 16 +-
.../distributed/near/GridNearGetFuture.java | 8 +-
.../transactions/IgniteTxLocalAdapter.java | 12 +-
.../cache/transactions/IgniteTxManager.java | 20 +-
.../processors/hadoop/HadoopJobInfo.java | 3 +-
.../processors/igfs/IgfsDataManager.java | 14 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 10 +-
.../internal/processors/igfs/IgfsProcessor.java | 24 --
.../ignite/internal/util/IgniteUtils.java | 45 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 7 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +-
.../IgniteCacheTxIteratorSelfTest.java | 241 +++++++++++++++++++
.../cluster/GridAddressResolverSelfTest.java | 97 ++++++++
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 26 --
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 ++++++
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../processors/hadoop/HadoopClassLoader.java | 26 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 8 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 14 +-
.../child/HadoopChildProcessRunner.java | 2 +-
.../processors/hadoop/v2/HadoopV2Job.java | 14 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../processors/hadoop/HadoopSnappyTest.java | 2 +-
.../processors/hadoop/HadoopTasksV1Test.java | 2 +-
.../processors/hadoop/HadoopTasksV2Test.java | 2 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 2 +-
.../collections/HadoopAbstractMapTest.java | 6 +-
.../include/ignite/binary/binary_containers.h | 191 ++++++++++++---
.../include/ignite/binary/binary_raw_reader.h | 25 +-
.../include/ignite/binary/binary_raw_writer.h | 13 +
.../include/ignite/binary/binary_reader.h | 13 +
.../include/ignite/binary/binary_writer.h | 13 +
.../platforms/cpp/common/include/ignite/date.h | 2 +-
.../cpp/common/include/ignite/ignite_error.h | 19 +-
.../cpp/common/include/ignite/timestamp.h | 2 +-
.../platforms/cpp/common/src/ignite_error.cpp | 12 +-
.../cpp/core/include/ignite/cache/cache.h | 186 ++++++++++++--
.../cpp/core/include/ignite/cache/cache_entry.h | 14 +-
.../include/ignite/cache/query/query_argument.h | 33 +--
.../include/ignite/cache/query/query_cursor.h | 17 +-
.../ignite/cache/query/query_fields_cursor.h | 11 +-
.../ignite/cache/query/query_fields_row.h | 22 +-
.../include/ignite/cache/query/query_scan.h | 10 +-
.../core/include/ignite/cache/query/query_sql.h | 15 +-
.../ignite/cache/query/query_sql_fields.h | 15 +-
.../platforms/cpp/core/include/ignite/ignite.h | 21 +-
.../core/include/ignite/ignite_configuration.h | 4 +-
.../cpp/core/include/ignite/ignition.h | 2 +-
.../include/ignite/transactions/transaction.h | 68 +++++-
.../ignite/transactions/transaction_consts.h | 84 +++++--
.../ignite/transactions/transaction_metrics.h | 13 +-
.../include/ignite/transactions/transactions.h | 36 ++-
modules/platforms/cpp/core/namespaces.dox | 2 +-
modules/platforms/cpp/cpp.dxg | 4 +-
modules/web-agent/README.txt | 13 +-
.../ignite/console/agent/AgentLauncher.java | 32 +--
modules/web-console/DEVNOTES.txt | 29 ++-
.../src/main/js/app/data/getting-started.json | 2 +-
.../ui-ace-java/ui-ace-java.directive.js | 4 +-
.../ui-ace-xml/ui-ace-xml.directive.js | 4 +-
.../main/js/app/modules/agent/agent.module.js | 4 +
.../src/main/js/app/modules/loading/loading.css | 2 +-
modules/web-console/src/main/js/app/vendor.js | 1 +
.../src/main/js/controllers/admin-controller.js | 2 +-
.../main/js/controllers/caches-controller.js | 23 ++
.../main/js/controllers/clusters-controller.js | 21 ++
.../src/main/js/controllers/common-module.js | 4 +-
.../main/js/controllers/domains-controller.js | 12 +
.../main/js/controllers/profile-controller.js | 5 +-
.../main/js/gulpfile.babel.js/tasks/build.js | 2 +-
.../src/main/js/gulpfile.babel.js/tasks/copy.js | 17 +-
.../main/js/gulpfile.babel.js/tasks/watch.js | 8 +-
.../main/js/gulpfile.babel.js/webpack/common.js | 24 +-
.../webpack/environments/production.js | 2 +-
.../webpack/plugins/progress.js | 50 ++--
modules/web-console/src/main/js/package.json | 1 +
.../src/main/js/public/images/cluster.png | Bin 100504 -> 29376 bytes
.../src/main/js/public/images/query-table.png | Bin 42253 -> 29189 bytes
modules/web-console/src/main/js/serve/agent.js | 39 +--
.../web-console/src/main/js/serve/browser.js | 2 +-
.../src/main/js/serve/routes/agent.js | 3 +-
.../src/main/js/serve/routes/profile.js | 2 +-
.../src/main/js/views/settings/profile.jade | 12 +-
.../web-console/src/main/js/views/signin.jade | 38 +--
.../web-console/src/main/js/views/sql/sql.jade | 2 +-
89 files changed, 1504 insertions(+), 432 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/573b5a67/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
