From ba703fd86f0fc95ee178436e7405e1263c1348aa Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 2 Nov 2011 19:02:03 +0000
Subject: [PATCH] fix db update!

git-svn-id: http://www.observium.org/svn/observer/trunk@2711 61d68cd4-352d-0410-923a-c4978735b2b8
---
 CHANGELOG           |  5 +++++
 database-update.sql | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1915dcc71b..1150ee5e0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,11 @@ http://www.observium.org/websvn/listing.php?repname=observer
 
 SVN
 
+* Smokeping integration
+* Fixed Cisco VLAN tracking
+* Much improved devices/ports browsing
+* Some improvements to map
+
 0.10.5.2248 ( 5th May 2011 )
 
 * Improve poller/discovery
diff --git a/database-update.sql b/database-update.sql
index 90ffb33dfa..edaaa3319f 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -12,10 +12,10 @@ ALTER TABLE `bills` ADD `rate_95th_in` int(11) NOT NULL;
 ALTER TABLE `bills` ADD `rate_95th_out` int(11) NOT NULL;
 ALTER TABLE `bills` ADD `rate_95th` int(11) NOT NULL;
 ALTER TABLE `bills` ADD `dir_95th` varchar(3) NOT NULL;
-ALTER TABLE `total_data` int(11) NOT NULL;
-ALTER TABLE `total_data_in` int(11) NOT NULL;
-ALTER TABLE `total_data_out` int(11) NOT NULL;
-ALTER TABLE `rate_average_in` int(11) NOT NULL;
-ALTER TABLE `rate_average_out` int(11) NOT NULL;
-ALTER TABLE `rate_average` int(11) NOT NULL;
-ALTER TABLE `bill_last_calc` datetime NOT NULL;
+ALTER TABLE `bills` ADD `total_data` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `total_data_in` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `total_data_out` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `rate_average_in` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `rate_average_out` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `rate_average` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `bill_last_calc` datetime NOT NULL;