pgbackrest.git / summary / log / commit / refs

commit    4925756dee22faee7bf6e1ca9bcd417d09cf5ba4
Author:   David Steele <david@pgmasters.net>
Date:     Sun Nov 22 23:16:54 2015 +0000

    Merge branch 'master' into dev after release 0.88


 CHANGELOG.md           | 5 +++++
 doc/xml/change-log.xml | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --cc CHANGELOG.md
index 008f8330e,4d823debd..86b97e874
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,8 -1,8 +1,13 @@@
  # pgBackRest<br/>Change Log
  
 +## v0.90: UNDER DEVELOPMENT
 +__No Release Date Set__
 +
++* 
++
+ ## v0.88: Documentation and Minor Bug Fixes
+ __Released November 22, 2015__
+ 
  * Added documentation in the user guide for delta restores, expiration, dedicated backup hosts, starting and stopping pgBackRest, and replication.
  
  * Fixed an issue where the `start`/`stop` commands required the `--config` option.
diff --cc doc/xml/change-log.xml
index 670b6b078,4d629d289..9be22508c
--- a/doc/xml/change-log.xml
+++ b/doc/xml/change-log.xml
@@@ -6,7 -6,7 +6,15 @@@
      </intro>
  
      <changelog>
 +        <changelog-release date="XXXX-XX-XX" version="0.90" title="UNDER DEVELOPMENT">
++            <release-feature-bullet-list>
++                <release-feature>
++                    <text></text>
++                </release-feature>
++            </release-feature-bullet-list>
++        </changelog-release>
++
+         <changelog-release date="2015-11-22" version="0.88" title="Documentation and Minor Bug Fixes">
              <release-feature-bullet-list>
                  <release-feature>
                      <text>Added documentation in the user guide for delta restores, expiration, dedicated backup hosts, starting and stopping <backrest/>, and replication.</text>


[parent: fa05715dec95]