Rev 4379: (tanner) merge 1.15final back to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4379
revision-id: pqm at pqm.ubuntu.com-20090523064024-0o95iuqvh8wj2zuz
parent: pqm at pqm.ubuntu.com-20090522070510-7axls2bemv3scgpw
parent: tanner at real-time.com-20090523045552-lytimqr336j9789r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-05-23 07:40:24 +0100
message:
  (tanner) merge 1.15final back to trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4378.1.1
    revision-id: tanner at real-time.com-20090523045552-lytimqr336j9789r
    parent: pqm at pqm.ubuntu.com-20090522070510-7axls2bemv3scgpw
    parent: tanner at real-time.com-20090523031709-ivn0zya2afnetf8c
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: bzr.dev
    timestamp: Fri 2009-05-22 23:55:52 -0500
    message:
      Merge 1.15final back to trunk
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4360.4.2
    tags: bzr-1.15
    revision-id: tanner at real-time.com-20090523031709-ivn0zya2afnetf8c
    parent: pqm at pqm.ubuntu.com-20090516081403-afos88lsnf4izasu
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: bzr.1.15
    timestamp: Fri 2009-05-22 22:17:09 -0500
    message:
      Release 1.15
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 4360.4.1
    revision-id: pqm at pqm.ubuntu.com-20090516081403-afos88lsnf4izasu
    parent: pqm at pqm.ubuntu.com-20090513232416-vt21661225sx5v8m
    parent: tanner at real-time.com-20090516071910-vx2yv1d6pkduc14e
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.15
    timestamp: Sat 2009-05-16 09:14:03 +0100
    message:
      (tanner) release 1.15rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2009-05-22 05:04:08 +0000
+++ b/NEWS	2009-05-23 04:55:52 +0000
@@ -43,13 +43,19 @@
 
 bzr 1.15
 ########
-:1.15rc1: 2009-04-06
+:1.15rc1: 2009-05-16
+:1.15: 2009-05-22
 
 The smart server will no longer raise 'NoSuchRevision' when streaming content
 with a size mismatch in a reconstructed graph search. New command ``bzr
 dpush``. Plugins can now define their own annotation tie-breaker when two
 revisions introduce the exact same line.
 
+Changes from 1.15rc1 to 1.15final
+*********************************
+
+* No changes
+
 Compatibility Breaks
 ********************