Merge remote-tracking branch 'origin/open1223' into open-1338

Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
parent 84345caf7d 065a5a6fbf
commit 38ad8058e8
25 changed files with 547 additions and 215 deletions
--- a/platform/features/plot/test/PlotControllerSpec.js
+++ b/platform/features/plot/test/PlotControllerSpec.js
@@ -66,6 +66,7 @@ define(
                        "getMetadata",
                        "getDomainValue",
                        "getRangeValue",
+                        "getDatum",
                        "request"
                    ]
                );