lp:~ubuntu-branches/ubuntu/lucid/desktopcouch/lucid-201101211957
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/lucid/desktopcouch/lucid-201101211957
Branch merges
- Ubuntu Development Team: Pending requested
- Diff: 0 lines
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 20. By Elliot Murphy
-
* New upstream bugfix release.
- Provide more isolation in tests to avoid polluting the env when
running tests.
- Drop no_uri.patch and revert_dbus_getport. patch (included upstream)
- Don't depend on simplejson, use built in json (LP: #511427)
- Provide a method for clients to enable/disable replication of
arbitrary databases with Ubuntu One (needed to allow enabling and
disabling of gwibber and contact syncing). - 18. By Elliot Murphy
-
In the last upload, I incorrectly resolved the merge presented
after running bzr merge-upstream --version=0.6.2
../desktopcouch_0.6.2. orig.tar. gz. So, the last upload had incorrect
contents in the tarball for desktopcouch/records/ server_ base.py and
desktopcouch/replication. py. This revision restores the correct contents
of those two files to match what was shipped in the upstream tarball.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/natty/desktopcouch