Merge branch 'ignite-222' into sprint-1

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

Branch: refs/heads/ignite-189
Commit: db8b4c7eb407da2725e66688f031eb6f9ceee5f3
Parents: f67cff2 8730563
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Wed Feb 11 15:47:44 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Wed Feb 11 15:47:44 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java | 11 +--
 .../ignite/internal/GridKernalContext.java      |  5 -
 .../ignite/internal/GridKernalContextImpl.java  | 13 +--
 .../apache/ignite/internal/GridProductImpl.java | 11 ++-
 .../apache/ignite/internal/IgniteKernal.java    | 61 +-----------
 .../internal/managers/GridManagerAdapter.java   | 14 ++-
 .../managers/security/GridSecurityImpl.java     | 95 -------------------
 .../processors/rest/GridRestProcessor.java      |  2 +-
 .../ignite/internal/product/IgniteProduct.java  |  8 ++
 .../optimized/optimized-classnames.properties   |  2 +-
 .../ignite/plugin/security/GridSecurity.java    | 97 --------------------
 .../plugin/security/GridSecuritySubject.java    |  1 -
 .../junits/GridTestKernalContext.java           |  3 +-
 .../ignite/testframework/junits/IgniteMock.java |  6 --
 .../org/apache/ignite/IgniteSpringBean.java     |  7 --
 15 files changed, 37 insertions(+), 299 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db8b4c7e/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------

Reply via email to