Merge remote-tracking branch 'remotes/origin/ignite-961' into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/309a71bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/309a71bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/309a71bb Branch: refs/heads/ignite-1121 Commit: 309a71bb4fda47363c527f0f8f84485de2dfa3d2 Parents: 0fd8fd8 a7f664e Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Fri Jul 17 16:00:39 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Fri Jul 17 16:00:39 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 73 ++++---- .../apache/ignite/internal/IgniteKernal.java | 12 ++ .../processors/cache/GridCacheContext.java | 45 +++-- .../processors/cache/GridCacheMvccManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 53 ++++++ .../distributed/dht/GridDhtTopologyFuture.java | 14 -- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 31 +--- .../cache/transactions/IgniteTxManager.java | 4 +- .../scripting/IgniteScriptingConverter.java | 44 +++++ .../scripting/IgniteScriptingProcessor.java | 41 ++++- .../org/apache/ignite/json/JSONCacheObject.java | 2 +- .../distributed/IgniteCache150ClientsTest.java | 1 + .../IgniteCacheClientReconnectTest.java | 175 +++++++++++++++++++ .../IgniteCacheServerNodeConcurrentStart.java | 96 ++++++++++ .../testframework/junits/GridAbstractTest.java | 5 + .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 - .../testsuites/IgniteClientNodesTestSuite.java | 42 +++++ modules/nodejs/src/main/js/server.js | 2 +- modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestHandler.java | 72 ++++---- .../http/jetty/GridJettyRestProtocol.java | 2 +- .../jetty/RestGlassFishScriptingConverter.java | 68 +++++++ 25 files changed, 669 insertions(+), 144 deletions(-) ----------------------------------------------------------------------
