~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2011-02-10 01:57:32 UTC
  • mfrom: (425 trunk)
  • mto: This revision was merged to the branch mainline in revision 426.
  • Revision ID: john@arbash-meinel.com-20110210015732-b3kkt1jp7bsqcv0v
Merge loggerhead trunk back into load-test to resolve
__init__.py conflicts from Jelmer's update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
=============================
3
3
 
4
4
1.19 [???]
5
 
----------
 
5
----------------
 
6
 
 
7
    - If we get a HEAD request, there is no reason to expand the template, we
 
8
      shouldn't be returning body content anyway.
 
9
      (John Arbash Meinel, #716201, #716217)
6
10
 
7
11
    - Merge the pqm changes back into trunk, after trunk was reverted to an old
8
12
      revision. (John Arbash Meinel, #716152)
9
13
 
 
14
 
10
15
1.18 [10Nov2010]
11
16
----------------
12
17