[Bps-public-commit] brackup branch, debian, updated. 1.09-01-12-20-g22fcfe8

[Alex Vandiver]

The branch, debian has been updated
       via  22fcfe8b336bd86581a384d32e18ad64960e75f5 (commit)
       via  190e68e0dc20fd27b5ecaacd3fb04d9114821aa2 (commit)
       via  38ee669ac3b9bd77cc2b58c8acedcf892ea1bb37 (commit)
       via  b20908dfc1494918e4b7acb2f43dbe830d88dc7b (commit)
       via  3e984db819301a2508db37f77c89e88f3f845ec2 (commit)
       via  580a48898e00ef7a30bef3d84e12aec6802fe030 (commit)
       via  b4eb24444a3234d270bd0af3360df4236b7f5801 (commit)
       via  1c7a2a83293592e69e517f7a842fa0fce2c0d34b (commit)
       via  109a022cbf28eab01651b3d5185fe4050961d42b (commit)
       via  976602e8f12d850fae19747c81fe62e3fe1e9ef1 (commit)
       via  de74b3a3bac8961a4084bac85c3c4079601a572c (commit)
       via  bbcada0a3339dd1edc8bbc58d1b6be1302ba48a4 (commit)
       via  c500fee0dff15cb143309036fd64a2a49f2fac17 (commit)
       via  de04f8ffc2bb9c3bcb2f5727863b797a98a5ed94 (commit)
       via  15c1495d7eddb0040413e29b4c037983da6f1301 (commit)
       via  4d1c5e99aec1ba20b73311dedad5affce815f48a (commit)
       via  e9e6904969af1625d5bce834ad9bafa6ea057546 (commit)
       via  fc647da300dffad6409aa1999ec4be150f6286fe (commit)
       via  e62467adfa80bf6b7b54d360730d0b36b1b3deda (commit)
       via  746be803dbc4a622837f9d0a63f55b6d83f9b8a8 (commit)
      from  4b1a3acc7c777a6fec5413413917647f61f97ffc (commit)

Summary of changes:
 Changes                                  |   14 +-
 MANIFEST                                 |   26 ++-
 brackup-restore                          |   17 ++-
 brackup-target                           |    4 +-
 brackup-verify-inventory                 |   13 +-
 debian/changelog                         |    8 +
 lib/Brackup.pm                           |    2 +-
 lib/Brackup/Config.pm                    |    8 +-
 lib/Brackup/File.pm                      |    6 +-
 lib/Brackup/Restore.pm                   |   90 ++++++---
 lib/Brackup/Target/Amazon.pm             |    2 +
 lib/Brackup/Target/Riak.pm               |  326 ++++++++++++++++++++++++++++++
 lib/Brackup/Test.pm                      |   21 ++-
 t/{01-backup-sftp.t => 01-backup-riak.t} |   12 +-
 t/07-restore-conflict.t                  |   81 ++++++++
 15 files changed, 567 insertions(+), 63 deletions(-)
 create mode 100644 lib/Brackup/Target/Riak.pm
 copy t/{01-backup-sftp.t => 01-backup-riak.t} (74%)
 create mode 100644 t/07-restore-conflict.t
 create mode 100644 t/data/zero-length.txt

- Log -----------------------------------------------------------------
commit 190e68e0dc20fd27b5ecaacd3fb04d9114821aa2
Merge: 4b1a3ac 38ee669
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 23 16:53:04 2010 -0500

    Merge branch 'master' into debian
    
    Conflicts:
    	lib/Brackup.pm

diff --cc lib/Brackup.pm
index 3b89e49,98fcba4..440ca87
--- a/lib/Brackup.pm
+++ b/lib/Brackup.pm
@@@ -1,7 -1,7 +1,7 @@@
  package Brackup;
  use strict;
  use vars qw($VERSION);
- $VERSION = '1.09_01';
 -$VERSION = '1.10';
++$VERSION = '1.10_01';
  
  use Brackup::Config;
  use Brackup::ConfigSection;

commit 22fcfe8b336bd86581a384d32e18ad64960e75f5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 23 17:35:23 2010 -0500

    Release 1.10_01-1

diff --git a/debian/changelog b/debian/changelog
index 9f18415..510d6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libbrackup-perl (1.10-01-1) karmic; urgency=low
+
+  * Updates from upstream
+
+  * Add --conflict=identical to skip identical-content files
+
+ -- Alex Vandiver <alexmv at bestpractical.com>  Wed, 23 Dec 2010 16:50:17 -0400
+
 libbrackup-perl (1.09-01-12) karmic; urgency=low
 
   * Capture and restore user/group ownership on files

-----------------------------------------------------------------------