Merge remote-tracking branch 'origin/ignite-1.6.11' into ignite-1.6.11
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d19bfc2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d19bfc2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d19bfc2 Branch: refs/heads/ignite-4242 Commit: 3d19bfc2b66574e3945ce17c7a4dfe77d0070b8d Parents: 950bad4 a98804a Author: dkarachentsev <[email protected]> Authored: Tue Nov 8 14:04:36 2016 +0300 Committer: dkarachentsev <[email protected]> Committed: Tue Nov 8 14:04:36 2016 +0300 ---------------------------------------------------------------------- .../security/SecurityBasicPermissionSet.java | 107 +++++++++ .../security/SecurityPermissionSetBuilder.java | 222 +++++++++++++++++++ .../SecurityPermissionSetBuilderTest.java | 93 ++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 3 + modules/platforms/cpp/binary/Makefile.am | 4 +- modules/platforms/cpp/core/Makefile.am | 4 +- .../cpp/examples/odbc-example/Makefile.am | 4 +- .../cpp/examples/putget-example/Makefile.am | 4 +- .../cpp/examples/query-example/Makefile.am | 4 +- modules/platforms/cpp/ignite/Makefile.am | 4 +- modules/platforms/cpp/jni/Makefile.am | 4 +- .../cpp/odbc-test/src/api_robustness_test.cpp | 63 ++++++ .../cpp/odbc-test/src/queries_test.cpp | 9 +- modules/platforms/cpp/odbc/Makefile.am | 4 +- .../cpp/odbc/include/ignite/odbc/statement.h | 42 ++++ modules/platforms/cpp/odbc/src/odbc.cpp | 116 +--------- modules/platforms/cpp/odbc/src/statement.cpp | 151 +++++++++++++ 17 files changed, 717 insertions(+), 121 deletions(-) ----------------------------------------------------------------------
