Clusters with the click

Build: #247 was successful Changes by Alvin Wang

Code commits

Coopr/develop

  • Alvin Wang

    Alvin Wang 261544ed53cc98afb8a21e6b96efd173775cb015

    Merge pull request #859 from cybervisiontech/feature/coopr-634
    COOPR-634: Add /resolve API for resolving templates with extend (parent) and includes (partials)

  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> 7825d153d92cb0d89f556dd1a468f909794dc511 m

    COOPR-634: change resolved test json due to changes in other jsons

    • coopr-server/src/test/resources/partials/cdap-distributed-resolved.json (version 7825d153d92cb0d89f556dd1a468f909794dc511)
    • derby.log (version 7825d153d92cb0d89f556dd1a468f909794dc511)
  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> 913752c477690d0b47107910eca363ac6089f5f2 m

    Merge remote-tracking branch 'upstream/develop' into feature/coopr-634

  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> 3d054ceebe790c5124e5c4e3de362fb451d55db6 m

    COOPR-634: update PR

    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version 3d054ceebe790c5124e5c4e3de362fb451d55db6)
    • coopr-server/src/test/java/co/cask/coopr/http/AdminHandlerTest.java (version 3d054ceebe790c5124e5c4e3de362fb451d55db6)
    • derby.log (version 3d054ceebe790c5124e5c4e3de362fb451d55db6)
  • rpedanov <rpedanov@platfora.com>

    rpedanov <rpedanov@platfora.com> d914cc8da9cdef5e6e7bdd735115be8e76e47508 m

    coopr-634 TemplateValidationException Test for template with errors

    • coopr-server/src/main/java/co/cask/coopr/cluster/ClusterService.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
    • coopr-server/src/main/java/co/cask/coopr/spec/template/TemplateMerger.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
    • coopr-server/src/main/java/co/cask/coopr/spec/template/TemplateValidationException.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
    • coopr-server/src/test/java/co/cask/coopr/http/AdminHandlerTest.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
    • coopr-server/src/test/java/co/cask/coopr/spec/template/PartialTemplateTest.java (version d914cc8da9cdef5e6e7bdd735115be8e76e47508)
  • rpedanov <rpedanov@platfora.com>

    rpedanov <rpedanov@platfora.com> 66006adac7f00eb2d25b6b31572ee1ada6cd7de7 m

    coopr-634 little change

    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version 66006adac7f00eb2d25b6b31572ee1ada6cd7de7)
  • rpedanov <rpedanov@platfora.com>

    rpedanov <rpedanov@platfora.com> 5de53bc8f4947658fe3e3683d380d38f68a0f337 m

    coopr-634 resolve merge conflicts

    • coopr-server/src/main/java/co/cask/coopr/spec/template/ClusterTemplate.java (version 5de53bc8f4947658fe3e3683d380d38f68a0f337)
    • coopr-server/src/test/java/co/cask/coopr/spec/template/PartialTemplateTest.java (version 5de53bc8f4947658fe3e3683d380d38f68a0f337)
    • coopr-server/src/test/resources/partials/ldap-partial.json (version 5de53bc8f4947658fe3e3683d380d38f68a0f337)
  • rpedanov <rpedanov@platfora.com>

    rpedanov <rpedanov@platfora.com> 29d91fad77dd9c4660ed3de4d02bf799604becd2 m

    coopr-634 Merge remote-tracking branch 'upstream/develop' into feature/coopr-634

  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> 2d51e92888dd37fadcda377b5fca2a7f6036c29f m

    COOPR-634: add /resolve endpoint test

    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version 2d51e92888dd37fadcda377b5fca2a7f6036c29f)
    • coopr-server/src/test/java/co/cask/coopr/http/AdminHandlerTest.java (version 2d51e92888dd37fadcda377b5fca2a7f6036c29f)
    • coopr-server/src/test/resources/partials/cdap-distributed-resolved.json (version 2d51e92888dd37fadcda377b5fca2a7f6036c29f)
  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> 5b6445189874e0b6e1b0d8573b40f49bea8ff318 m

    COOPR-634: delete unnecessary code

    • coopr-server/src/test/java/co/cask/coopr/spec/template/PartialTemplateTest.java (version 5b6445189874e0b6e1b0d8573b40f49bea8ff318)
  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> f2087157b99fcdc0958929242a1ac41c5e5e29cc m

    COOPR-634: fix /resolve method

    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version f2087157b99fcdc0958929242a1ac41c5e5e29cc)
    • coopr-server/src/main/java/co/cask/coopr/spec/template/ClusterTemplate.java (version f2087157b99fcdc0958929242a1ac41c5e5e29cc)
  • Yurii Talashko <ytalashko@continuuity.com>

    Yurii Talashko <ytalashko@continuuity.com> ce786d3b066c1d4e562e1c7092a3183d056aa341 m

    Merge remote-tracking branch 'upstream/develop' into feature/coopr-634
    Conflicts:
            coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java
            coopr-server/src/test/java/co/cask/coopr/spec/template/PartialTemplateTest.java
            coopr-server/src/test/resources/partials/cdap-distributed-insecure.json
            coopr-server/src/test/resources/partials/cdap-distributed-secure-hadoop.json
            coopr-server/src/test/resources/partials/cdap-distributed.json
            coopr-server/src/test/resources/partials/ldap-partial.json
            coopr-server/src/test/resources/partials/sensu-partial.json

  • rpedanov <rpedanov@platfora.com>

    rpedanov <rpedanov@platfora.com> 99a6741f8e783de1e781ebe512ca863e0a9fac4d m

    COOPR-634 rest interface for resolve template

    • coopr-server/src/main/java/co/cask/coopr/http/handler/AdminHandler.java (version 99a6741f8e783de1e781ebe512ca863e0a9fac4d)
    • coopr-server/src/main/java/co/cask/coopr/spec/template/PartialTemplate.java (version 99a6741f8e783de1e781ebe512ca863e0a9fac4d)