summaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-11-11 23:13:03 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-11-12 15:56:30 +0100
commit53ec8afee9c963de5883b9b7ca9bd6537deef123 (patch)
treeae953982f85e211710ba75c90ed44eb0a1dd083d /debian/changelog
parent174e54f8455f9f5372da6469c5b093353bcd50ee (diff)
parentf6b3d6dc89e4ba5c2ec643931394db45b8c7f176 (diff)
downloadbcfg2-53ec8afee9c963de5883b9b7ca9bd6537deef123.tar.gz
bcfg2-53ec8afee9c963de5883b9b7ca9bd6537deef123.tar.bz2
bcfg2-53ec8afee9c963de5883b9b7ca9bd6537deef123.zip
Merge branch 'maint'
Conflicts: debian/changelog doc/conf.py doc/releases/index.txt doc/server/database.txt doc/server/plugins/generators/cfg.txt doc/server/plugins/generators/sslca.txt man/bcfg2.conf.5 misc/bcfg2-selinux.spec misc/bcfg2.spec osx/Makefile osx/macports/Portfile schemas/packages.xsd solaris-ips/MANIFEST.bcfg2-server.header solaris-ips/MANIFEST.bcfg2.header solaris-ips/Makefile solaris-ips/pkginfo.bcfg2 solaris-ips/pkginfo.bcfg2-server solaris/Makefile solaris/pkginfo.bcfg2 solaris/pkginfo.bcfg2-server src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Proxy.py src/lib/Bcfg2/Client/Tools/APT.py src/lib/Bcfg2/Client/Tools/Action.py src/lib/Bcfg2/Client/Tools/SYSV.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Reporting/Collector.py src/lib/Bcfg2/Reporting/templates/base.html src/lib/Bcfg2/Server/Admin/__init__.py src/lib/Bcfg2/Server/BuiltinCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/Packages/Apt.py src/lib/Bcfg2/Server/Plugins/Probes.py src/lib/Bcfg2/settings.py src/lib/Bcfg2/version.py testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py testsuite/Testsrc/test_code_checks.py
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e30fba546..c41b2ecc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ bcfg2 (1.4.0pre1-0.0) unstable; urgency=low
-- Sol Jerome <sol.jerome@gmail.com> Mon, 16 Jun 2014 09:36:13 -0500
+bcfg2 (1.3.5-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Fri, 05 Sep 2014 07:54:48 -0500
+
bcfg2 (1.3.4-0.0) unstable; urgency=low
* New upstream release