[couchdb-nano] branch alernativetopr242 updated (2c09e05 -> 4955dae)

[gl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

glynnbird pushed a change to branch alernativetopr242
in repository https://gitbox.apache.org/repos/asf/couchdb-nano.git.


    from 2c09e05  alternative to pr #242 using toughcookie library for axios
     add 5e94455  Fix link to changesReader in toc (#239)
     add 64ba7c4  Fix invalid parameters error stack trace (#244)
     new 4955dae  fix merge conflict

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md   | 2 +-
 lib/nano.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

[couchdb-nano] 01/01: fix merge conflict

[gl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

glynnbird pushed a commit to branch alernativetopr242
in repository https://gitbox.apache.org/repos/asf/couchdb-nano.git

commit 4955dae345b29b77a14759d413fe34125fd2eccd
Merge: 2c09e05 64ba7c4
Author: Glynn Bird <gl...@apache.org>
AuthorDate: Mon Dec 21 09:20:00 2020 +0000

    fix merge conflict

 README.md   | 2 +-
 lib/nano.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --cc lib/nano.js
index 92e20b2,cf6773a..d4e55e3
--- a/lib/nano.js
+++ b/lib/nano.js
@@@ -14,11 -14,6 +14,10 @@@ const { URL } = require('url'
  const assert = require('assert')
  const querystring = require('qs')
  const axios = require('axios').default
 +const axiosCookieJarSupport = require('axios-cookiejar-support').default
 +const tough = require('tough-cookie')
 +axiosCookieJarSupport(axios)
 +const cookieJar = new tough.CookieJar()
- const INVALID_PARAMETERS_ERROR = new Error('Invalid parameters')
  const stream = require('stream')
  const http = require('http')
  const https = require('https')