Peter M. Groen / knowledgetree

Commit e44e82e7685883eecb87decc4a8a5341d9d3b1b5

Authored by Kevin G Fourie
2 parents cbaf75bc 0bb2c891

Merge branch 'edge'

Inline Side-by-side
Showing 5 changed files with 9 additions and 8 deletions
docs/VERSION-NAME.txt
  View file @e44e82e
1 -3.6.2  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +3.6.3
docs/VERSION-OSS-DEV.txt
  View file @e44e82e
1 -3.6.2  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +3.6.3
docs/VERSION-OSS.txt
  View file @e44e82e
1 -3.6.2  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +3.6.3
docs/VERSION.txt
  View file @e44e82e
1 -3.6.2  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +3.6.3
sql/mysql/install/data.sql
  View file @e44e82e
@@ -1458,8 +1458,8 @@ LOCK TABLES `system_settings` WRITE; @@ -1458,8 +1458,8 @@ LOCK TABLES `system_settings` WRITE;
1458 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */; 1458 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */;
1459 INSERT INTO `system_settings` VALUES 1459 INSERT INTO `system_settings` VALUES
1460 (1,'lastIndexUpdate','0'), 1460 (1,'lastIndexUpdate','0'),
1461 -(2,'knowledgeTreeVersion','3.6.2'),  
1462 -(3,'databaseVersion','3.6.2'), 1461 +(2,'knowledgeTreeVersion','3.6.3'),
  1462 +(3,'databaseVersion','3.6.3'),
1463 (4,'server_name','127.0.0.1'); 1463 (4,'server_name','127.0.0.1');
1464 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */; 1464 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
1465 UNLOCK TABLES; 1465 UNLOCK TABLES;
@@ -1758,7 +1758,8 @@ INSERT INTO `upgrades` VALUES @@ -1758,7 +1758,8 @@ INSERT INTO `upgrades` VALUES
1758 (219,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), 1758 (219,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'),
1759 (220, 'sql*3.6.1*0*3.6.1/search_ranking.sql', 'Database upgrade to version 3.6.1: Search ranking','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'), 1759 (220, 'sql*3.6.1*0*3.6.1/search_ranking.sql', 'Database upgrade to version 3.6.1: Search ranking','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'),
1760 (221,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'), 1760 (221,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'),
1761 -(222,'upgrade*3.6.2*99*upgrade3.6.2','Upgrade from version 3.6.1 to 3.6.2','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'); 1761 +(222,'upgrade*3.6.2*99*upgrade3.6.2','Upgrade from version 3.6.1 to 3.6.2','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'),
  1762 +(223,'upgrade*3.6.3*99*upgrade3.6.3','Upgrade from version 3.6.2 to 3.6.3','2009-06-01 00:00:00',1,'upgrade*3.6.3*99*upgrade3.6.3');
1762 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; 1763 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1763 UNLOCK TABLES; 1764 UNLOCK TABLES;
1764 1765
@@ -2689,7 +2690,7 @@ UNLOCK TABLES; @@ -2689,7 +2690,7 @@ UNLOCK TABLES;
2689 LOCK TABLES `zseq_upgrades` WRITE; 2690 LOCK TABLES `zseq_upgrades` WRITE;
2690 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */; 2691 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
2691 INSERT INTO `zseq_upgrades` VALUES 2692 INSERT INTO `zseq_upgrades` VALUES
2692 -(222); 2693 +(223);
2693 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */; 2694 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
2694 UNLOCK TABLES; 2695 UNLOCK TABLES;
2695 2696