schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
| 8 --------
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnOrgConfiguration-scap.sql
| 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit c66c8fd452c95f0bfc8f703f7a8ad0ba0381495c
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jun 4 09:29:53 2013 -0400
Resolve upgrade-script naming collision
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
deleted file mode 100644
index 02d1ae7..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table rhnOrgConfiguration
- add scapfile_upload_enabled
- char(1) default ('N') not null
- constraint rhn_org_conf_scap_upload_chk check (scapfile_upload_enabled in
('Y', 'N'));
-alter table rhnOrgConfiguration
- add scap_file_sizelimit
- number default(2097152) not null
- constraint rhn_org_conf_scap_szlmt_chk check (scap_file_sizelimit >= 0);
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnOrgConfiguration-scap.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnOrgConfiguration-scap.sql
new file mode 100644
index 0000000..02d1ae7
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnOrgConfiguration-scap.sql
@@ -0,0 +1,8 @@
+alter table rhnOrgConfiguration
+ add scapfile_upload_enabled
+ char(1) default ('N') not null
+ constraint rhn_org_conf_scap_upload_chk check (scapfile_upload_enabled in
('Y', 'N'));
+alter table rhnOrgConfiguration
+ add scap_file_sizelimit
+ number default(2097152) not null
+ constraint rhn_org_conf_scap_szlmt_chk check (scap_file_sizelimit >= 0);