From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 16 Nov 2009 10:00:34 +0000 (+0100)
Subject: Merge branch 'master' into readline-bconsole-restore
X-Git-Tag: Release-5.0.0~246^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3fe17b53281b5b18437a63036251e62bb6a5a414;p=bacula%2Fbacula

Merge branch 'master' into readline-bconsole-restore

Conflicts:
	bacula/technotes
---

3fe17b53281b5b18437a63036251e62bb6a5a414
diff --cc bacula/technotes
index cef68832a7,85814a0aaa..4702e751ea
--- a/bacula/technotes
+++ b/bacula/technotes
@@@ -2,8 -2,9 +2,13 @@@
            
  General:
  
++16Nov09
++ebl  Add basic completion for restore mode 
+ 14Nov09
+ kes  Fix bug #1367 buy creating an empty query.sql file. The old query.sql
+      file is now in exmaples/sample-query.sql, but is unsupported.
 +13Nov09
 +ebl  Add .jobs type=B/C/R command to filter jobs listing
  11Nov09
  ebl  Fix basejob code for Mysql
  ebl  Fix segfault in basejob code