| Author | 
Committer | 
Branch | 
Timestamp | 
Parent | 
 | 
| pstorz | 
pstorz | 
master | 
2017-03-31 11:58 | 
master bc733038 | 
Pending | 
| 
	Changeset | 
Merge branch 'bareos-16.2' into bareos-16.2-db2170 | 
| mod - platforms/win32/winbareos.nsi | 
Diff File | 
| mod - src/dird/backup.c | 
Diff File | 
| mod - src/dird/dird.c | 
Diff File | 
| mod - src/dird/dird_conf.c | 
Diff File | 
| mod - src/dird/dird_conf.h | 
Diff File | 
| mod - src/dird/migrate.c | 
Diff File | 
| mod - src/dird/protos.h | 
Diff File | 
| mod - src/dird/restore.c | 
Diff File | 
| mod - src/findlib/unittests/fstype_test.c | 
Diff File | 
| mod - src/lib/parse_conf.c | 
Diff File | 
| mod - src/stored/dir_cmd.c | 
Diff File |