Repository: incubator-ignite Updated Branches: refs/heads/ignite-56 2f9881d3f -> fe6b7669f
Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15e8b406 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15e8b406 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15e8b406 Branch: refs/heads/ignite-56 Commit: 15e8b406b4fa2ce2e6087abe1ca3c170d6893a25 Parents: 7dd91ec f698f2a Author: ivasilinets <[email protected]> Authored: Thu Feb 5 12:48:19 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 12:48:19 2015 +0300 ---------------------------------------------------------------------- modules/extdata/p2p/META-INF/gridgain.xml | 40 ------------------- modules/extdata/p2p/META-INF/ignite.xml | 40 +++++++++++++++++++ .../p2p/GridP2PUserVersionChangeSelfTest.java | 12 +++--- .../GridUriDeploymentFileProcessorSelfTest.java | 10 ++--- .../META-INF/bad-signed-deployfile-gridgain.xml | 39 ------------------ .../META-INF/bad-signed-deployfile-ignite.xml | 39 ++++++++++++++++++ .../META-INF/deploy-with-resources-gridgain.xml | 37 ----------------- .../META-INF/deploy-with-resources-ignite.xml | 37 +++++++++++++++++ .../uri/META-INF/deploydepend-gridgain.xml | 37 ----------------- .../uri/META-INF/deploydepend-ignite.xml | 37 +++++++++++++++++ .../uri/META-INF/deploydir-gridgain.xml | 38 ------------------ .../uri/META-INF/deploydir-ignite.xml | 38 ++++++++++++++++++ .../uri/META-INF/deployfile-gridgain.xml | 38 ------------------ .../uri/META-INF/deployfile-ignite.xml | 38 ++++++++++++++++++ .../deployment/uri/META-INF/gridgain.brokenxml | 18 --------- .../spi/deployment/uri/META-INF/gridgain.empty | 0 .../deployment/uri/META-INF/gridgain.incorrefs | 18 --------- .../spi/deployment/uri/META-INF/gridgain.xml | 38 ------------------ .../deployment/uri/META-INF/ignite.brokenxml | 18 +++++++++ .../spi/deployment/uri/META-INF/ignite.empty | 0 .../deployment/uri/META-INF/ignite.incorrefs | 18 +++++++++ .../spi/deployment/uri/META-INF/ignite.xml | 38 ++++++++++++++++++ .../deployment/uri/META-INF/p2p-gridgain.xml | 42 -------------------- .../spi/deployment/uri/META-INF/p2p-ignite.xml | 42 ++++++++++++++++++++ .../well-signed-deployfile-gridgain.xml | 38 ------------------ .../META-INF/well-signed-deployfile-ignite.xml | 38 ++++++++++++++++++ .../apache/ignite/tools/GridToolsSelfTest.java | 10 ++--- .../ignite/tools/gartask/META-INF/gridgain.xml | 38 ------------------ .../ignite/tools/gartask/META-INF/ignite.xml | 38 ++++++++++++++++++ 29 files changed, 437 insertions(+), 437 deletions(-) ----------------------------------------------------------------------
