Merge branch '7.x' of https://github.com/Islandora/islandora into centralize_dc

Conflicts:
	islandora.module

.travis.yml

@@ -17,6 +17,19 @@ matrix:
     - php: 5.3.3
       dist: precise
       env: FEDORA_VERSION="3.8.1"
+  allow_failures:
+    - php: 5.3.3
+      dist: precise
+      env: FEDORA_VERSION="3.5"
+    - php: 5.3.3
+      dist: precise
+      env: FEDORA_VERSION="3.6.2"
+    - php: 5.3.3
+      dist: precise
+      env: FEDORA_VERSION="3.7.0"
+    - php: 5.3.3
+      dist: precise
+      env: FEDORA_VERSION="3.8.1"
 php:
   - 5.4
   - 5.5

README.md

@@ -69,8 +69,6 @@ Further documentation for this module is available at [our documentation wiki](h
 
 ## Troubleshooting/Issues
 
-NOTE: There has been a function signature change for the `ingestDatastream` function within Tuque which will be deprecated after the 7.x-1.10 release. To read about it in detail please see the [JIRA ticket](https://jira.duraspace.org/browse/ISLANDORA-1995). For the time being there is a warning stating that this will become deprecated and that code that utilizes this specific behavior should be updated. Once this code is updated the `islandora_deprecation_return_false_when_datastream_exists` variable may be set to FALSE so the warning no longer displays. An example for doing this with drush: `drush vset islandora_deprecation_return_false_when_datastream_exists FALSE`.
-
 Having problems or solved a problem? Check out the Islandora google groups for a solution.
 
 * [Islandora Group](https://groups.google.com/forum/?hl=en&fromgroups#!forum/islandora)

islandora.install

@@ -133,3 +133,14 @@ function islandora_update_7001(&$sandbox) {
   $t = get_t();
   return $t("Islandora database updates complete");
 }
+
+/**
+ * Implements hook_update_N().
+ *
+ * Removing old variable around changes to ingestDatastream signature.
+ * These changes are complete and deprecation warnings are removed.
+ */
+function islandora_update_7002() {
+  // Removing as the deprecation has been removed.
+  variable_del('islandora_deprecation_return_false_when_datastream_exists');
+}

islandora.module

@@ -663,7 +663,7 @@ function islandora_i18n_string_info() {
 }
 
 /**
- * Implements hook_islandora_i18n_string_list().
+ * Implements hook_i18n_string_list().
  */
 function islandora_i18n_string_list($group) {
   if ($group == 'islandora') {