Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: shubham2706/pycassa
base: master
...
head fork: pycassa/pycassa
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 20, 2013
@thobbs thobbs Accurate docstring for gm_timestamp
Fixes #202
d8f4d69
Commits on Jul 03, 2013
Andre Cruz When a connection is recycled, and the pool is full, the old connecti…
…on would be disposed twice.

This would happen because the Queue.Full exception would be raised, and so "conn"" would be the old connection that has already been disposed. This connection would again be disposed due to the Full exception.
07c2d11
@thobbs thobbs Merge pull request #205 from edevil/DisposeRecycled
When a connection is recycled, and the pool is full, the old connection would be disposed twice.
958ce9c
Commits on Jul 17, 2013
@thobbs thobbs Use temporary Travis workaround for C* 67a9fd1
Commits on Jul 19, 2013
@thobbs thobbs Handle empty strings for IntegerType values
Fixes #206
6529a7d
Commits on Jul 20, 2013
André Cruz Merge branch 'master', remote-tracking branch 'origin' fda2b4e
Commits on Jul 26, 2013
Andre Cruz Use a lock around all updates to shared state.
Prevent closed connections from ending up in the pool (Mutator uses "return_to_pool"). Since current_conns has already been decremented, the pool would reach a state where a new connection was always opened but could not be put in the queue since it was full.
5171ee4
Commits on Jul 29, 2013
André Cruz Corrected tests. 8d664ba
Commits on Jul 30, 2013
@pilate pilate Allow ranging over ring tokens
Would close #170
97cfd5a
@thobbs thobbs Move conn transport check to ConnectionPool.put()
Connection.return_to_pool() also goes through this method
b54e637
@thobbs thobbs Use with statement for pool lock acquisition da20f70
@pilate pilate Handle more than one iteration
Fix kwargs
409bdcc
@pilate pilate Set buffer length at correct location
Added incompatible argument exception
b24ec32
@pilate pilate Replacing newline 486667f
Commits on Jul 31, 2013
@thobbs thobbs Stricter check on incompatible get_range() arguments 3664309
@thobbs thobbs Add docs for start_token, end_token f26d6a9
@thobbs thobbs Fix requireOPP test decorator aead733
@thobbs thobbs Handle false-y start and finish_token 9ff9bdb
@thobbs thobbs Tests for get_range by token, minor fixes 02cac9f
@thobbs thobbs Merge branch '211-merge' d5b666b
Commits on Aug 02, 2013
Andre Cruz Make sure connection count is decremented as we are disposing connect…
…ions from pool.

Remove unused var.
33d64b4
Commits on Aug 05, 2013
@thobbs thobbs Merge pull request #213 from edevil/MissingDec
Make sure connection count is decremented as we are disposing connection...
6ea16a0
Commits on Aug 16, 2013
@thobbs thobbs Bump version to 1.9.1, update changelog 30bee0c
Commits on Sep 17, 2013
@thobbs thobbs Fix docstring for start/finish_token formats
The tokens only need to be hex encoded when using
ByteOrderedPartitioner.
fd21960
@thobbs thobbs Make master branch version 1.9.1+ d5f764f
Commits on Oct 03, 2013
@rbranson rbranson Support for atomic batches 5224ada
@thobbs thobbs Merge pull request #215 from rbranson/atomic-batches
Support for atomic batches
f52e654
@thobbs thobbs Remove extra newlines 3b2a893
@thobbs thobbs Update changelog, bump version to 1.10.0 a80ac67
@thobbs thobbs Bump version to 1.10.0+ post-release e728703
Commits on Oct 17, 2013
@kurtjx kurtjx hacky pass at uuid sorting 2d543a0
Commits on Oct 18, 2013
@thobbs thobbs Preserve stacktrace on TApplicationException 803ef57
Commits on Nov 06, 2013
@bjornedstrom bjornedstrom Update interface to 19.36.1. bf680fe
Commits on Nov 29, 2013
@a13x a13x remove returns timestamp
Stub should behave as the "real" thing.
3605299
Commits on Jan 10, 2014
@thobbs thobbs Merge pull request #223 from a13x/patch-1
remove returns timestamp
4a45070
@thobbs thobbs Merge pull request #219 from bjornedstrom/master
Update interface to 19.36.1.
3e66911
@thobbs thobbs Remove Travic CI workaround e1017c5
@thobbs thobbs Merge branch 'travis-fix' 22f3468
@thobbs thobbs Wait for and verify C* startup in Travis edbf064
Commits on Jan 14, 2014
@thobbs thobbs Upgrade to latest ez_setup.py c841381
@thobbs thobbs Update changelog, bump version to 1.11.0 820bbc2
@thobbs thobbs Set post-release version 92af27d
@thobbs thobbs Add LOCAL_ONE to API docs 7ffe498
@thobbs thobbs Add TimestampType alias for DateType
Cassandra 2.0 added TimestampType, which is the same as DateType except
for the sorting of pre-epoch (negative) unix timestamps.

Fixes #225
e22f411
Commits on Feb 04, 2014
@kurtjx kurtjx superficial test and uuid.time approach bf5f7cd
@kurtjx kurtjx whoops, fix my superficial test so it imports stuff it needs 0fddc32
@thobbs thobbs Merge pull request #218 from kurtjx/master
hacky pass at uuid sorting
7fbb698
@thobbs thobbs Stubs and tests minor cleanup 6ce8d7c
Commits on Feb 06, 2014
@thobbs thobbs Add readme note about cql/native protocol e9baafb
Commits on Feb 20, 2014
@pgorla pgorla Add token map to system_manager. 2446a15
Commits on Mar 21, 2014
@decbis decbis Corrected StatsLogger example.
It suggested that the stats would be a property of the ConnectionPool.
8a8694e
Commits on Apr 07, 2014
@sbadia sbadia [debian] Bump to 1.11.0 and fix lintian errors
Lintian fixes:
- usused-build-dependency-on-cdbs
- *-nmu (non maintainer upload)
- latest-debian-changelog-entry-changed-to-native
- missing-license-paragraph-in-dep5-copyright
22ad2b3
Commits on Apr 10, 2014
@thobbs thobbs Merge pull request #227 from thelastpickle/issue-1
Add token map to system_manager.
15aad9f
@thobbs thobbs Merge pull request #231 from sbadia/debian
[debian] Bump to 1.11.0 and fix lintian errors
99354cc
@thobbs thobbs Merge pull request #230 from decbis/master
Corrected StatsLogger example.
8a2bea1
@sbadia sbadia [debian] Add depends on libjs-underscore for pycassa-doc
Fix lintian warning « embedded-javascript-library »
for usr/share/doc/pycassa-doc/manual/_static/underscore.js
Refer to Debian Policy Manual section 4.13 (Convenience copies of code)
eb62837
@sbadia sbadia [debian] wrap and sort d/control file 028111b
@sbadia sbadia [debian] Add registration into doc-base
possible-documentation-but-no-doc-base-registration
f373c1d
@sbadia sbadia [debian] Add myself as uploader and update changelog 8a4b4ad
Commits on Apr 11, 2014
@thobbs thobbs Merge pull request #232 from sbadia/debian
Update for debian release
d0d9677
@sbadia sbadia [debian] Update d/rules and switch to non-native package
- Cleaned debian/rules by using python2 and sphinxdoc
- Added debian/watch file
- Override get-orig-source (remove .git and debian dir. from .orig tgz)

https://wiki.debian.org/DebianMentorsFaq#What_is_the_difference_between_a_native_Debian_package_and_a_non-native_package.3F
https://wiki.debian.org/DebianMentorsFaq#What.27s_wrong_with_upstream_shipping_a_debian.2F_directory.3F
e278929
@thobbs thobbs Merge pull request #233 from sbadia/debian
[debian] Update d/rules and switch to non-native package
7ac677f
Commits on Apr 21, 2014
@dkong dkong Fix typos in "Composite Types" doc f64ece4
Commits on Apr 22, 2014
@thobbs thobbs Merge pull request #234 from dkong/fix_doc_typo
Fix typos in "Composite Types" doc
b4ad4c4
Commits on May 02, 2014
@thobbs thobbs Add notes about using the native protocol driver 5a8fbbd
@thobbs thobbs Fix readme, doc formatting 7441430
Commits on Aug 07, 2014
@stevemer stevemer Fix documentation typos (it's bothered me for months) 65e1196
@thobbs thobbs Merge pull request #237 from stevemer/master
Fix documentation typos (it's bothered me for months)
e135180
Dave Brueck fixed minor docstring typos 6ed9e0b
Commits on Aug 08, 2014
@thobbs thobbs Merge pull request #239 from dfb/master
fixed minor docstring typos
268bfd4
Commits on Jan 07, 2015
@thobbs thobbs Update changelog, bump version to 1.11.1 6ef8710
@thobbs thobbs set post-release version 3be0766