Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ce34a04e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ce34a04e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ce34a04e Branch: refs/heads/master Commit: ce34a04e4cbe748a048c9d1b87402f1fffebb96c Parents: d8d1ded 61d0d7a Author: Michael Russo <[email protected]> Authored: Mon Mar 7 18:00:01 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Mon Mar 7 18:00:01 2016 -0800 ---------------------------------------------------------------------- .../core/astyanax/CassandraClusterImpl.java | 34 ++++++++++++++++---- .../persistence/core/astyanax/CassandraFig.java | 8 +++++ 2 files changed, 36 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
