Fix compile issue post-merge with master to get current.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6a1fd223 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6a1fd223 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6a1fd223 Branch: refs/heads/datastax-cass-driver Commit: 6a1fd223b3e0f1a677af1d6b0d0c87b25d525da7 Parents: c356671 Author: Michael Russo <[email protected]> Authored: Sun May 1 14:37:08 2016 +0800 Committer: Michael Russo <[email protected]> Committed: Sun May 1 14:37:08 2016 +0800 ---------------------------------------------------------------------- .../apache/usergrid/persistence/core/CassandraFig.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6a1fd223/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java index 184eeee..d8620be 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java @@ -90,11 +90,11 @@ public interface CassandraFig extends GuicyFig { @Default( "9160" ) int getThriftPort(); - @Key( "cassandra.username" ) + @Key( USERNAME ) @Default( DEFAULT_USERNAME ) String getUsername(); - @Key( "cassandra.password" ) + @Key( PASSWORD ) @Default( DEFAULT_PASSWORD ) String getPassword(); @@ -102,12 +102,6 @@ public interface CassandraFig extends GuicyFig { @Default( DEFAULT_LOCAL_DC ) String getLocalDataCenter(); - @Key( USERNAME ) - String getUsername(); - - @Key( PASSWORD ) - String getPassword(); - @Key( "cassandra.connections" ) @Default( DEFAULT_CONNECTION_POOLSIZE ) int getConnections();
