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: 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.

-------------------------------------
author: Andreas Short
date: 2012-12-03 17:39:06.210000000

Uploaded patch set 4.

-------------------------------------
author: Andreas Short
date: 2012-12-03 18:06:53.756000000

Patch Set 4: Verified



-------------------------------------
author: Natasha Sullivan
date: 2012-12-03 18:06:53.776000000

Patch Set 4: Looks good to me, approved



-------------------------------------
author: Andreas Short
date: 2012-12-03 18:07:27.780000000

Change has been successfully merged into the git repository.

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