Permalink
Browse files

merge detritus

  • Loading branch information...
acdha committed Jul 15, 2011
1 parent 62dc7d1 commit 19038f563a4b9fb03a2731f2df186bca33c22877
Showing with 0 additions and 4 deletions.
  1. +0 −4 RESTful Bag Store.rst
View
@@ -258,15 +258,11 @@ are of particular value for archival and replication:
* Clients *MUST* honor HTTP 503 Service Unavailable responses using a provided
``Retry-After`` header or using exponential back-off if ``Retry-After`` is not
provided.
-<<<<<<< HEAD
* Servers *SHOULD* support HTTP Pipelining and Keep-Alives to avoid
performance issues when transferring large numbers of small files
-=======
* Servers *SHOULD* return HTTP 410 (Gone) for content which has been removed,
particularly in the case of old versions for bags which are still present.
->>>>>>> versioned-example
-
Operations
~~~~~~~~~~

0 comments on commit 19038f5

Please sign in to comment.