Merge remote-tracking branch 'remotes/origin/ignite-204' 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/da544966 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da544966 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da544966 Branch: refs/heads/sprint-1 Commit: da54496660b52a4090f87e37fa44929077e21ee2 Parents: 8083d9a 278ae1d Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Feb 11 17:44:37 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Feb 11 17:44:37 2015 +0300 ---------------------------------------------------------------------- modules/clients/src/test/keystore/generate.sh | 25 ++++++++++---------- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../ignite/events/AuthorizationEvent.java | 2 +- .../org/apache/ignite/events/CacheEvent.java | 2 +- .../apache/ignite/events/CheckpointEvent.java | 2 +- .../apache/ignite/events/DeploymentEvent.java | 2 +- .../java/org/apache/ignite/events/JobEvent.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 3 +-- modules/core/src/test/config/tests.properties | 6 ++--- .../http/jetty/GridJettyRestHandler.java | 2 +- .../cache/websession/GridWebSessionFilter.java | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
