~cmiller/desktopcouch/pairing-fixups

Viewing all changes in revision 46.

  • Committer: Tarmac
  • Author(s): eric.casteleijn at canonical
  • Date: 2009-08-25 17:43:10 UTC
  • mfrom: (44.1.4 noauth)
  • Revision ID: elliot@elliotmurphy.com-20090825174310-qcd1500zpdgsf2zh
This comments out two sections in the .ini file, to disable authentication, since it's not working as long as couchdb-478 is not fixed.

This has these four other branches merged in, and all conflicts removed:

lp:~thisfred/desktopcouch/any_port_in_a_storm/
lp:~sil/desktopcouch/create-oauth-tokens-startup
lp:~sil/desktopcouch/get-oauth-tokens-function
lp:~sil/desktopcouch/not-so-random

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: