[icinga-checkins] icinga.org: icinga-web/master: Updated VERSION metadata for release 1.7.1

git at icinga.org git at icinga.org
Wed Jun 20 08:47:17 CEST 2012


Module: icinga-web
Branch: master
Commit: e3dc4cb77a418b5a50120d6a9f02e7985879d6c1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=e3dc4cb77a418b5a50120d6a9f02e7985879d6c1

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jun 18 13:30:07 2012 +0200

Updated VERSION metadata for release 1.7.1

Conflicts:

	doc/VERSION

---

 doc/VERSION                                    |    2 +-
 etc/schema/mysql.sql                           |    2 +-
 etc/schema/pgsql.sql                           |    2 +-
 etc/schema/sqlite.sql                          |    2 +-
 etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql  |    2 ++
 etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql |    2 ++
 etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql  |    2 ++
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/VERSION b/doc/VERSION
index bd8bf88..cab0ff9 100644
--- a/doc/VERSION
+++ b/doc/VERSION
@@ -1 +1 @@
-1.7.0
+1.8.0-dev
\ No newline at end of file
diff --git a/etc/schema/mysql.sql b/etc/schema/mysql.sql
index ea3f656..de7f216 100644
--- a/etc/schema/mysql.sql
+++ b/etc/schema/mysql.sql
@@ -39,7 +39,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
 /*          Initial data import              */
  
 INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0');
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql
index 4e42e01..f44b456 100644
--- a/etc/schema/pgsql.sql
+++ b/etc/schema/pgsql.sql
@@ -48,7 +48,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
 /*          Initial data import              */
  
 INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_created,user_modified) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0',NOW(),NOW());
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/sqlite.sql b/etc/schema/sqlite.sql
index fd6ecf5..e661fc1 100644
--- a/etc/schema/sqlite.sql
+++ b/etc/schema/sqlite.sql
@@ -154,7 +154,7 @@ CREATE TABLE cronk_principal_cronk (
 
 /*          Initial data import              */
  
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', DATETIME('now'), DATETIME('now'));
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', DATETIME('now'), DATETIME('now'));
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql b/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
new file mode 100644
index 0000000..f0dde06
--- /dev/null
+++ b/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
@@ -0,0 +1,2 @@
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
diff --git a/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql b/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
new file mode 100644
index 0000000..1bb34d8
--- /dev/null
+++ b/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
@@ -0,0 +1,2 @@
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
diff --git a/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql b/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
new file mode 100644
index 0000000..f0dde06
--- /dev/null
+++ b/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
@@ -0,0 +1,2 @@
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());





More information about the icinga-checkins mailing list