[syncany] 08/14: Merge tag 'upstream/0.4.7_alpha'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository syncany.

commit 36761c061935b601c7d39bf34d02568dcc567bd2
Merge: f27dde6 0643c60
Author: Markus Koschany <apo at debian.org>
Date:   Wed Nov 11 22:51:46 2015 +0100

    Merge tag 'upstream/0.4.7_alpha'
    
    Upstream version 0.4.7~alpha
    
    # gpg: Signature made Wed 11 Nov 2015 22:51:42 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 .gitignore                                         |   1 +
 CHANGELOG.md                                       |  11 +
 build.gradle                                       |   2 +-
 gradle/arch/syncany/PKGBUILD                       |   6 +-
 gradle/daemon/syncanyd.bat.skel                    |   8 +-
 gradle/gradle/application.distribution.gradle      |   6 +-
 gradle/innosetup/innoinstall.sh                    |   5 +-
 gradle/osx/syncany.rb                              |  11 +-
 .../main/java/org/syncany/cli/PluginCommand.java   |   2 +-
 .../operations/down/DatabaseFileReader.java        | 160 +++++++++++++
 .../org/syncany/operations/down/DownOperation.java | 126 ++--------
 .../down/FileSystemActionReconciliator.java        |  15 +-
 .../down/actions/ChangeFileSystemAction.java       |   6 +-
 .../down/actions/FileCreatingFileSystemAction.java |  11 +-
 .../down/actions/NewFileSystemAction.java          |   5 +-
 .../syncany/operations/init/ConnectOperation.java  |   2 +-
 .../restore/RestoreFileSystemAction.java           |   5 +-
 .../operations/restore/RestoreOperation.java       |   6 +-
 .../org/syncany/operations/up/UpOperation.java     | 256 +++++++++++----------
 .../plugins/local/LocalTransferManager.java        |   2 +-
 .../TransactionAwareFeatureTransferManager.java    |  11 +-
 .../java/org/syncany/tests/ScenarioTestSuite.java  |   4 +
 .../operations/FileSystemActionComparatorTest.java |   2 +-
 .../Issue520NoResumeOnCorruptXmlScenarioTest.java  |  77 +++++++
 24 files changed, 474 insertions(+), 266 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/syncany.git