Uploaded image for project: 'CouchDB'
  1. CouchDB
  2. COUCHDB-1999

Merge BigCouch and rcouch

    XMLWordPrintableJSON

Details

    • New Feature
    • Status: Closed
    • Major
    • Resolution: Won't Fix
    • None
    • None
    • None
    • None

    Description

      This issue is the master issue to track the BigCouch and rcouch.

                    rebase
       nebraska     master                             done
            +-------x----+------+--------+------------X------------------->
                    |    |      |        |            +
                    |    |      |        |            |
       integration  |    v      v        v            v
            +-------x----------------------------------------+------------>
                    | ^    ^       ^           ^      ^      |
                    | |    |       |           |      |      |
       rcouch       | |    |       |           |      +      |
            +-------x-+----+-------+-----------+------X------|------------>
                    |                                        |
                    |                                        |
       master       |                                        |
            +-------x----------------------------------------v------------>
                                                              merge to master
      

      via http://www.asciiflow.com/#Draw3086755538105541081/1497478309

      1. nebraska and rcouch branches rebase from master from tag merge-rebase-target / d5f0976.
      2. nebraska continues with its work and periodically pushes to integration.
      3. rcouch continues with its work and periodically pushes to integration.
      4. at point `done`, both rcouch and nebraska can verify all their stuff works.
      5. at point `merge to master` the end result goes into CouchDB master and we can make a release.

      Please link all related issues with this one.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              jan Jan Lehnardt
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: