Merge branch 'master' into ID_detect

core/src/test/scala/com/salesforce/op/filters/FeatureDistributionTest.scala

@@ -192,7 +192,7 @@ class FeatureDistributionTest extends FlatSpec with PassengerSparkFixtureTest wi
  it should "have toString" in {
  FeatureDistribution("A", None, 10, 1, Array(1, 4, 0, 0, 6), Array.empty).toString() shouldBe
  "FeatureDistribution(type = Training, name = A, key = None, count = 10, nulls = 1, " +
- "distribution = [1.0,4.0,0.0,0.0,6.0], summaryInfo = [], cardinality = , rawFeatureType = )"
+ "distribution = [1.0,4.0,0.0,0.0,6.0], summaryInfo = [])"
  }
 
  it should "marshall to/from json" in {