[Pkg-owncloud-commits] [ocsync] 02/08: Merge tag 'upstream/0.90.0'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository ocsync.

commit 8a902bf9c5aa07664c9e12a57bc688c8d39d3d91
Merge: a52f383 e1368bf
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Sep 11 19:56:41 2013 +0200

    Merge tag 'upstream/0.90.0'
    
    Upstream version 0.90.0
    
    # gpg: Unterschrift vom Mi 11 Sep 2013 19:56:40 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                          |    2 +-
 CMakeLists.txt                                |    4 +-
 ChangeLog                                     |   22 +-
 client/csync_auth.c                           |    6 +-
 client/csync_client.c                         |    2 +-
 cmake/Modules/DefineCMakeDefaults.cmake       |    3 +
 cmake/Modules/DefineCompilerFlags.cmake       |   63 +++--
 config/ocsync_exclude.conf                    |    8 +-
 modules/csync_dummy.c                         |    2 +-
 modules/csync_owncloud.c                      |  257 ++++++++++++++------
 modules/csync_owncloud.h                      |   23 +-
 modules/csync_owncloud_recursive_propfind.c   |   10 +-
 modules/csync_owncloud_util.c                 |   27 +++
 modules/csync_sftp.c                          |    2 +-
 modules/csync_sftp2.c                         |    2 +-
 modules/csync_smb.c                           |    4 +-
 src/csync.c                                   |  241 ++++++++++---------
 src/csync.h                                   |   63 ++++-
 src/csync_exclude.c                           |   46 ++--
 src/csync_exclude.h                           |   19 +-
 src/csync_lock.c                              |    2 +-
 src/csync_log.c                               |    2 +-
 src/csync_log.h                               |    6 +
 src/csync_misc.c                              |    1 +
 src/csync_misc.h                              |    7 +
 src/csync_private.h                           |   14 +-
 src/csync_propagate.c                         |  313 ++++++++++++++++++++-----
 src/csync_propagate.h                         |    5 +
 src/csync_reconcile.c                         |    4 +-
 src/csync_rename.cc                           |    8 +-
 src/csync_rename.h                            |    2 +-
 src/csync_statedb.c                           |  231 ++++++++++++------
 src/csync_time.c                              |   10 +-
 src/csync_update.c                            |   76 ++++--
 src/csync_util.c                              |   92 ++++++--
 src/httpbf/src/httpbf.c                       |   83 +++++--
 src/httpbf/src/httpbf.h                       |   18 +-
 src/httpbf/tests/hbf_send_test.c              |    2 +-
 src/std/c_file.c                              |  100 ++++++--
 src/std/c_file.h                              |   10 +
 src/std/c_macro.h                             |    3 +
 src/std/c_private.h                           |    7 +-
 src/std/c_string.c                            |   31 ++-
 src/std/c_string.h                            |    9 +
 src/vio/csync_vio.c                           |   12 +-
 src/vio/csync_vio.h                           |    2 +-
 src/vio/csync_vio_file_stat.h                 |    4 +-
 src/vio/csync_vio_local.c                     |   37 +--
 src/vio/csync_vio_local.h                     |    2 +-
 src/vio/csync_vio_method.h                    |    2 +-
 tests/csync_tests/check_csync_exclude.c       |   21 +-
 tests/csync_tests/check_csync_statedb_query.c |   11 +-
 tests/csync_tests/check_csync_update.c        |   17 +-
 tests/httpbf_tests/hbf_send_test.c            |    4 +-
 tests/ownCloud/ownCloud/Test.pm               |   13 +-
 tests/ownCloud/t3.pl                          |   19 ++
 tests/ownCloud/t4.pl                          |   25 +-
 57 files changed, 1422 insertions(+), 589 deletions(-)

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