diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-11 13:09:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-11 13:09:23 +0000 |
| commit | 8e21b4e2b7fe9d38985cc9fab266808083aa4158 (patch) | |
| tree | ed1c366897dca5024c13401c82c213db68b65561 | |
| parent | 367baf47c1effeb4fc05dd231d4b427da9f3f14d (diff) | |
| download | aports-8e21b4e2b7fe9d38985cc9fab266808083aa4158.tar.bz2 aports-8e21b4e2b7fe9d38985cc9fab266808083aa4158.tar.xz | |
main/postgresql-bdr*: move from testing
the conflict should be resolved now
| -rw-r--r-- | main/postgresql-bdr-extension/APKBUILD (renamed from testing/postgresql-bdr-extension/APKBUILD) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/APKBUILD (renamed from testing/postgresql-bdr/APKBUILD) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/initdb.patch (renamed from testing/postgresql-bdr/initdb.patch) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/pgbdr-restore.confd (renamed from testing/postgresql-bdr/pgbdr-restore.confd) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/pgbdr-restore.initd (renamed from testing/postgresql-bdr/pgbdr-restore.initd) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/postgresql-bdr-osxflags.patch (renamed from testing/postgresql-bdr/postgresql-bdr-osxflags.patch) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/postgresql-bdr.confd (renamed from testing/postgresql-bdr/postgresql-bdr.confd) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/postgresql-bdr.initd (renamed from testing/postgresql-bdr/postgresql-bdr.initd) | 0 | ||||
| -rw-r--r-- | main/postgresql-bdr/postgresql-bdr.pre-upgrade (renamed from testing/postgresql-bdr/postgresql-bdr.pre-upgrade) | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/testing/postgresql-bdr-extension/APKBUILD b/main/postgresql-bdr-extension/APKBUILD index b9284233d3..b9284233d3 100644 --- a/testing/postgresql-bdr-extension/APKBUILD +++ b/main/postgresql-bdr-extension/APKBUILD diff --git a/testing/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD index 814963db9f..814963db9f 100644 --- a/testing/postgresql-bdr/APKBUILD +++ b/main/postgresql-bdr/APKBUILD diff --git a/testing/postgresql-bdr/initdb.patch b/main/postgresql-bdr/initdb.patch index e919d9fc1b..e919d9fc1b 100644 --- a/testing/postgresql-bdr/initdb.patch +++ b/main/postgresql-bdr/initdb.patch diff --git a/testing/postgresql-bdr/pgbdr-restore.confd b/main/postgresql-bdr/pgbdr-restore.confd index 84a179f6cd..84a179f6cd 100644 --- a/testing/postgresql-bdr/pgbdr-restore.confd +++ b/main/postgresql-bdr/pgbdr-restore.confd diff --git a/testing/postgresql-bdr/pgbdr-restore.initd b/main/postgresql-bdr/pgbdr-restore.initd index eef552bd5e..eef552bd5e 100644 --- a/testing/postgresql-bdr/pgbdr-restore.initd +++ b/main/postgresql-bdr/pgbdr-restore.initd diff --git a/testing/postgresql-bdr/postgresql-bdr-osxflags.patch b/main/postgresql-bdr/postgresql-bdr-osxflags.patch index fd3d9c14b5..fd3d9c14b5 100644 --- a/testing/postgresql-bdr/postgresql-bdr-osxflags.patch +++ b/main/postgresql-bdr/postgresql-bdr-osxflags.patch diff --git a/testing/postgresql-bdr/postgresql-bdr.confd b/main/postgresql-bdr/postgresql-bdr.confd index c6e8c6d993..c6e8c6d993 100644 --- a/testing/postgresql-bdr/postgresql-bdr.confd +++ b/main/postgresql-bdr/postgresql-bdr.confd diff --git a/testing/postgresql-bdr/postgresql-bdr.initd b/main/postgresql-bdr/postgresql-bdr.initd index d47c50540a..d47c50540a 100644 --- a/testing/postgresql-bdr/postgresql-bdr.initd +++ b/main/postgresql-bdr/postgresql-bdr.initd diff --git a/testing/postgresql-bdr/postgresql-bdr.pre-upgrade b/main/postgresql-bdr/postgresql-bdr.pre-upgrade index 6116252c19..6116252c19 100644 --- a/testing/postgresql-bdr/postgresql-bdr.pre-upgrade +++ b/main/postgresql-bdr/postgresql-bdr.pre-upgrade |