DESCRIPTION

JCBC-154: Merge special release 1.1c branch fixes in for release 1.1.

* Jasmin Rangel/release11c:
  JCBC-130: Add a timeout for unresponsive http connection fetches.
  Correcting view tests with wrong exception handling.
  [Backport] Cancel view requests when the operation is cancelled.
  JCBC-100: [Backport] Add better error handling on view fetches.

Conflicts:
	src/main/java/com/couchbase/client/CouchbaseClient.java
	src/test/java/com/couchbase/client/ViewTest.java

Also, had to add a minor change to ViewNodeTest.java to add a view
since the NoDocsOperationImpl had changed.

Change-Id: I9a1ddd2b57c3a2d5e8801414ab72b4d435c7c5cb


COMMENTS

author: Andreas Short
date: 2012-12-03 09:14:36.955000000

Uploaded patch set 3.

-------------------------------------
author: Jasmin Rangel
date: 2012-12-03 09:14:38.553000000

Patch Set 3:

New patchset patch-id matches previous patchset, but commit message has changed.

-------------------------------------
author: Yasmin Rush
date: 2012-12-03 10:14:19.027000000

Patch Set 3: Looks good to me, but someone else must approve



-------------------------------------
author: Natasha Sullivan
date: 2012-12-03 10:53:09.136000000

Patch Set 3: Looks good to me, approved

It's fine in this case, normally due to a recent change you need to pass in the view itself because then it will determine for spatial/non spatial and so on. Not needed here. +2

-------------------------------------
author: Andreas Short
date: 2012-12-03 16:21:17.745000000

Patch Set 3: Verified



-------------------------------------
author: Tate Garrett
date: 2012-12-03 16:21:17.885000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
