Merge branch 'no_php' into SPARK-3454

nemccarthy · May 6, 2015 · 85fdb3e · 85fdb3e
2 parents 1fc65b0 + 1276900
commit 85fdb3e
Show file tree

Hide file tree

Showing 44 changed files with 3,967 additions and 15,264 deletions.
diff --git a/...xpectations/applications/json_expectation → ...ns/application_list_json_expectation.json b/...xpectations/applications/json_expectation → ...ns/application_list_json_expectation.json
@@ -1,9 +1,9 @@
 [ {
-  "id" : "local-1427397477963",
+  "id" : "local-1430917381534",
   "name" : "Spark shell",
   "attempts" : [ {
-    "startTime" : "2015-03-26T19:17:57.184GMT",
-    "endTime" : "2015-03-26T19:20:02.949GMT",
+    "startTime" : "2015-05-06T13:03:00.893GMT",
+    "endTime" : "2015-05-06T13:03:11.398GMT",
     "sparkUser" : "irashid",
     "completed" : true
   } ]