summaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
authorJack Neely <jjneely@ncsu.edu>2011-06-22 13:37:58 -0400
committerJack Neely <jjneely@ncsu.edu>2011-06-22 13:37:58 -0400
commitb848b5303c21c2dcb3d3c52e260944676864e332 (patch)
treed1969c51a20a227b42ffb4c077ba1df79d784240 /debian/changelog
parent9d0c43a54e4172061af2779336b821bb93fefc71 (diff)
parent1186eae0c62ba6810ea597083bd8e56d487811c0 (diff)
downloadbcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz
bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2
bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip
Merge branch 'master' into yumng
Conflicts: src/lib/Client/Tools/YUMng.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 01e4478d0..cf46d1507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.0pre3-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Sat, 18 Jun 2011 22:41:29 -0500
+
bcfg2 (1.2.0-0.0pre2) unstable; urgency=low
* New upstream release