]> git.sur5r.net Git - bacula/bacula/commit - bacula/src/filed/job.c
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Wed, 30 Sep 2009 09:59:44 +0000 (11:59 +0200)
committerEric Bollengier <eric@eb.homelinux.org>
Wed, 30 Sep 2009 09:59:44 +0000 (11:59 +0200)
commit91580252aed0942e864d7b7b851ef8de8a3d03e5
treec6a0d3dc7eba5658b12b0d161435d0f3c70c004a
parent527ba9317966d77ce9a059738cc11f5863674711
parent01c5f43041b5ee7f8a4fb1c1a49d102207c20eb0
Merge branch 'master' into basejobv3

Conflicts:
regress/tests/speed-test
bacula/src/baconfig.h
bacula/src/cats/sql_cmds.c
bacula/src/dird/dird.c
bacula/src/dird/dird_conf.c
bacula/src/findlib/find_one.c