Repository: cassandra Updated Branches: refs/heads/trunk 619954cd5 -> 113ba2a53
Fix merge error at 619954cd5cd2a4d41a95eef7c95fdca6333fb5d8 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/113ba2a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/113ba2a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/113ba2a5 Branch: refs/heads/trunk Commit: 113ba2a533d98f2adb8e2a6bf022891abc382b34 Parents: 619954c Author: adelapena <a.penya.gar...@gmail.com> Authored: Wed May 10 11:30:05 2017 +0100 Committer: adelapena <a.penya.gar...@gmail.com> Committed: Wed May 10 11:30:05 2017 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/113ba2a5/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index 8c72a68..7f2f22b 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java @@ -1924,7 +1924,7 @@ public class SASIIndexTest try { // unsupported partition key column - SASIIndex.validateOptions(Collections.singletonMap("target", "id"), store.metadata); + SASIIndex.validateOptions(Collections.singletonMap("target", "id"), store.metadata()); Assert.fail(); } catch (ConfigurationException e) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
