Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/214a461e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/214a461e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/214a461e Branch: refs/heads/ignite-gg-9973 Commit: 214a461e4da316ea92d92514327fdd6523ab451f Parents: 71f201c ddb8e91 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 2 12:58:11 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 2 12:58:11 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 + ipc/shmem/README.txt | 2 +- .../visor/cache/VisorCacheConfiguration.java | 81 ++++++++------------ .../cache/VisorCacheNearConfiguration.java | 11 ++- .../visor/node/VisorGridConfiguration.java | 28 ++++++- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../resources/META-INF/classnames.properties | 79 +++++-------------- .../GridUriDeploymentFileResourceLoader.java | 2 +- parent/pom.xml | 10 ++- 9 files changed, 102 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
