Repository: usergrid Updated Branches: refs/heads/master f3effd2ad -> 46bb9b506
Fix astyanax dependency issue and ensure the thrift buffer size config is used in the client configuration. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/46bb9b50 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/46bb9b50 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/46bb9b50 Branch: refs/heads/master Commit: 46bb9b506350717b2ca0f8ff6e4934585b8e25c4 Parents: f3effd2 Author: Michael Russo <michaelaru...@gmail.com> Authored: Thu Jan 28 19:42:49 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Thu Jan 28 19:42:49 2016 -0800 ---------------------------------------------------------------------- .../usergrid/persistence/core/astyanax/CassandraClusterImpl.java | 3 ++- stack/pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/46bb9b50/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java index 674e076..cc52f1b 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java @@ -67,7 +67,8 @@ public class CassandraClusterImpl implements CassandraCluster { .setDiscoveryType( NodeDiscoveryType.valueOf( cassandraFig.getDiscoveryType() ) ) .setTargetCassandraVersion( cassandraFig.getVersion() ) .setDefaultReadConsistencyLevel( cassandraConfig.getReadCL() ) - .setDefaultWriteConsistencyLevel( cassandraConfig.getWriteCL() ); + .setDefaultWriteConsistencyLevel( cassandraConfig.getWriteCL() ) + .setMaxThriftSize( cassandraFig.getThriftBufferSize() ); if(cassandraFig.useSharedPoolForLocks()){ http://git-wip-us.apache.org/repos/asf/usergrid/blob/46bb9b50/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index 3dca4d4..e97e16e 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -98,7 +98,7 @@ <!-- =================================================================== --> <amber-version>0.22-incubating</amber-version> - <astyanax.version>1.56.49-SNAPSHOT-UG-1</astyanax.version> + <astyanax.version>3.9.0</astyanax.version> <aws.version>1.10.20</aws.version> <cassandra-version>1.2.18</cassandra-version> <guava.version>18.0</guava.version>