Merge remote-tracking branch 'origin/ignite-32' into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab091d1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab091d1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab091d1b Branch: refs/heads/ignite-32 Commit: ab091d1b05f79dcccbad6284ee4e4b95e1dc1a7f Parents: a20d599 3791a12 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jan 30 21:26:20 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jan 30 21:26:20 2015 +0700 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 6 +- .../processors/cache/GridCacheAdapter.java | 16 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 42 ++- .../GridCacheAbstractProjectionSelfTest.java | 50 ++++ .../IgniteCrossCacheTxStoreSelfTest.java | 288 +++++++++++++++++++ .../IgniteCacheTxStoreSessionTest.java | 11 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../schema-load/src/main/java/media/style.css | 11 +- .../ignite/schema/model/PojoDescriptor.java | 4 +- .../apache/ignite/schema/model/PojoField.java | 15 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 69 +++-- .../commands/alert/VisorAlertCommand.scala | 2 +- .../visor/commands/gc/VisorGcCommand.scala | 13 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 25 +- 16 files changed, 494 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
