[Pkg-debile-commits] [debile-master] 28/28: Merge remote-tracking branch 'debian/master' into with-apt

[Léo Cavaillé]

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

leo.cavaille-guest pushed a commit to branch master
in repository debile-master.

commit bf448e351f73c430d5e42d80835a64d16d43ca91
Merge: 7f44063 53bbebc
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Wed Aug 21 10:47:34 2013 +0200

    Merge remote-tracking branch 'debian/master' into with-apt
    
    Conflicts:
    	TODO

 TODO |    3 +++
 1 file changed, 3 insertions(+)

diff --cc TODO
index f40447a,f509afb..43cfa8e
--- a/TODO
+++ b/TODO
@@@ -1,5 -1,8 +1,8 @@@
  * Get ride of the virtualenv
  * Package firehose
  * Use the Debian packages instead of the requirements.txt
 -
 +* For security reasons don't let lucyd boot with admin/admin or at least warn the user
 +* Add an SSL layer
+ * Manage a kind of PPA
+ * Manage the debian-mentors upload and test of new packages
+ * Transition tests "please add this version foo of this package and try to rebuild all the rdep"
 -

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