← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 12:24:06 UTC
  • mfrom: (436 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 438.
  • Revision ID: john@arbash-meinel.com-20110316122406-xdv5771vlih6s76q
Merge trunk and resolve NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
16
16
    - Merge the pqm changes back into trunk, after trunk was reverted to an old
17
17
      revision. (John Arbash Meinel, #716152)
18
18
 
 
19
    - Redirect ``/files/file.txt`` to ``/view/file.txt`` and ``/view/dir`` to
 
20
      ``/files/dir``. (Jasper St. Pierre, #569358)
 
21
 
19
22
    - Remove ``start-loggerhead`` and ``stop-loggerhead`` which were already
20
23
      deprecated. (John Arbash Meinel)
21
24