summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-23 17:15:51 +0000
committerGerrit Code Review <review@openstack.org>2017-07-23 17:15:51 +0000
commitf2c28cea20dc7cb2b731b398ef8e848f4b76c2a3 (patch)
tree8660029bebc1e0cf353391e01cd18fc87f336ad5
parent346bc07096d6a23079939045c4d0754878ee974a (diff)
parent0f251117c9fdcdfe54fcc96fbdef5a78542e7310 (diff)
Merge "Upgrade media module to 2.9"
-rw-r--r--commons.make2
-rw-r--r--patches/0016-commons-file_entity-2.3.patch11
-rw-r--r--patches/0017-commons-media-2.9.patch11
3 files changed, 24 insertions, 0 deletions
diff --git a/commons.make b/commons.make
index ce6d4de..29e2da5 100644
--- a/commons.make
+++ b/commons.make
@@ -13,3 +13,5 @@ projects[commons][patch][] = "patches/0012-commons-title-alpha9.patch"
13projects[commons][patch][] = "patches/0013-commons-views-3.15.patch" 13projects[commons][patch][] = "patches/0013-commons-views-3.15.patch"
14projects[commons][patch][] = "patches/0014-commons-metatag-1.21.patch" 14projects[commons][patch][] = "patches/0014-commons-metatag-1.21.patch"
15projects[commons][patch][] = "patches/0015-commons-media-2.0.patch" 15projects[commons][patch][] = "patches/0015-commons-media-2.0.patch"
16projects[commons][patch][] = "patches/0016-commons-file_entity-2.3.patch"
17projects[commons][patch][] = "patches/0017-commons-media-2.9.patch" \ No newline at end of file
diff --git a/patches/0016-commons-file_entity-2.3.patch b/patches/0016-commons-file_entity-2.3.patch
new file mode 100644
index 0000000..b93cda9
--- /dev/null
+++ b/patches/0016-commons-file_entity-2.3.patch
@@ -0,0 +1,11 @@
1--- commons.org/drupal-org.make 2017-07-23 16:44:31.000000000 +0200
2+++ commons/drupal-org.make 2017-07-23 16:45:51.000000000 +0200
3@@ -159,7 +159,7 @@
4
5 projects[file_entity][type] = "module"
6 projects[file_entity][subdir] = "contrib"
7-projects[file_entity][version] = "2.0-beta3"
8+projects[file_entity][version] = "2.3"
9
10 projects[flag][type] = "module"
11 projects[flag][subdir] = "contrib"
diff --git a/patches/0017-commons-media-2.9.patch b/patches/0017-commons-media-2.9.patch
new file mode 100644
index 0000000..85e725b
--- /dev/null
+++ b/patches/0017-commons-media-2.9.patch
@@ -0,0 +1,11 @@
1--- commons.org/drupal-org.make 2017-07-23 16:44:31.000000000 +0200
2+++ commons/drupal-org.make 2017-07-23 16:45:51.000000000 +0200
3@@ -218,7 +218,7 @@
4
5 projects[media][type] = "module"
6 projects[media][subdir] = "contrib"
7-projects[media][version] = "2.0"
8+projects[media][version] = "2.9"
9
10 projects[media_oembed][type] = "module"
11 projects[media_oembed][subdir] = "contrib" \ No newline at end of file