couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jan Lehnardt (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (COUCHDB-1999) Merge BigCouch and rcouch
Date Sun, 15 Dec 2013 17:47:06 GMT

     [ https://issues.apache.org/jira/browse/COUCHDB-1999?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Jan Lehnardt updated COUCHDB-1999:
----------------------------------

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

{noformat}
              rebase
 nebraska     master                             done
      +-------x----+------+--------+------------X------------------->
              |    |      |        |            +
              |    |      |        |            |
 integration  |    v      v        v            v
      +-------x----------------------------------------+------------>
              | ^    ^       ^           ^      ^      |
              | |    |       |           |      |      |
 rcouch       | |    |       |           |      +      |
      +-------x-+----+-------+-----------+------X------|------------>
              |                                        |
              |                                        |
 master       |                                        |
      +-------x----------------------------------------v------------>
                                                        merge to master
{noformat}
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.


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

{noformat}
              rebase
 nebraska     master                             done
      +-------x----+------+--------+------------X------------------->
              |    |      |        |            +
              |    |      |        |            |
 integration  |    v      v        v            v
      +-------x----------------------------------------+------------>
              | ^    ^       ^           ^      ^      |
              | |    |       |           |      |      |
 rcouch       | |    |       |           |      +      |
      +-------x-+----+-------+-----------+------X------|------------>
              |                                        |
              |                                        |
 master       |                                        |
      +-------x----------------------------------------v------------>
                                                        merge to master
{noformat}’
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.



> Merge BigCouch and rcouch
> -------------------------
>
>                 Key: COUCHDB-1999
>                 URL: https://issues.apache.org/jira/browse/COUCHDB-1999
>             Project: CouchDB
>          Issue Type: New Feature
>            Reporter: Jan Lehnardt
>
> This issue is the master issue to track the BigCouch and rcouch.
> {noformat}
>               rebase
>  nebraska     master                             done
>       +-------x----+------+--------+------------X------------------->
>               |    |      |        |            +
>               |    |      |        |            |
>  integration  |    v      v        v            v
>       +-------x----------------------------------------+------------>
>               | ^    ^       ^           ^      ^      |
>               | |    |       |           |      |      |
>  rcouch       | |    |       |           |      +      |
>       +-------x-+----+-------+-----------+------X------|------------>
>               |                                        |
>               |                                        |
>  master       |                                        |
>       +-------x----------------------------------------v------------>
>                                                         merge to master
> {noformat}
> 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.



--
This message was sent by Atlassian JIRA
(v6.1.4#6159)

Mime
View raw message