[Pkg-owncloud-commits] [php-sabredav] 64/275: Merge branch '2.0'

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 42003748fab822ac7197782c01c936c4e349977f
Merge: 0762124 07f41f4
Author: Evert Pot <me at evertpot.com>
Date:   Thu Jun 12 13:22:24 2014 -0400

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md            | 10 +++++++++-
 examples/basicauth.php  | 26 --------------------------
 examples/digestauth.php | 25 -------------------------
 3 files changed, 9 insertions(+), 52 deletions(-)

diff --cc ChangeLog.md
index 93e649d,4896748..d96cc05
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,24 -1,19 +1,30 @@@
  ChangeLog
  =========
  
 +2.1.0-alpha1 (2014-??-??)
 +-------------------------
 +
 +* Changed: PropertyStorage backends now have a `move` method.
 +* Added: `beforeMove`, and `afterMove` events.
 +* #460: PropertyStorage must move properties during MOVE requests
 +* Changed: Restructured the zip distribution to be a little bit more lean
 +  and consistent.
 +
- 2.0.2 (2014-05-??)
++
+ 2.0.2 (2014-06-12)
  ------------------
  
+ * #470: Fixed compatibility with PHP < 5.4.14.
  * #467: Fixed a problem in `examples/calendarserver.php`.
  * #466: All the postgresql sample files have been updated.
  * Fixed: An error would be thrown if a client did a propfind on a node the
    user didn't have access to.
+ * Removed: Old and broken example code from the `examples/` directory.
+ * The zip release ships with [sabre/vobject 3.2.3][vobj],
+   [sabre/http 2.0.3][http], and [sabre/event 1.0.1][evnt].
+ 
  
 +
  2.0.1 (2014-05-28)
  ------------------
  

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