diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
| commit | 03754659d6381ac95d4d5e8dc612d3ad6865b581 (patch) | |
| tree | 0e7339c5937c5d6e3ce44538ddeb83d1e9cfdcfb /debian | |
| parent | 3482cc3995b86f0f053a7e010f82451de292a266 (diff) | |
| parent | a3f643fc9d8fc4b45c1bed3cfa8415afb9eb3873 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper into bzrplugin
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8ab9a70..e3dd4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ etckeeper (0.16) UNRELEASED; urgency=low - * Use new API in bzr plugin. + [ Jelmer Vernooij ] + * Use new Bazaar API. + + [ Joey Hess] + * Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make it + easy to configure etckeeper to abort an installation if there are + uncommitted changes in /etc. Closes: #478754 - -- Jelmer Vernooij <jelmer@samba.org> Thu, 15 May 2008 19:26:00 +0200 + -- Joey Hess <joeyh@debian.org> Sat, 07 Jun 2008 16:07:09 -0400 etckeeper (0.15) unstable; urgency=low |