Commit Graph

400 Commits

Author SHA1 Message Date
Sylvain Lebresne 88bdda742c Update version for 1.2.1 release 2013-01-24 18:43:10 +01:00
Sylvain Lebresne 7eb47c50c3 Update version for 1.1.9 release 2013-01-14 18:32:05 +01:00
Aaron Morton 6108a34bba Ensure Jackson dependency matches lib
Patch by Nat McCall, reviewed by Aaron Morton for Cassandra-5126
2013-01-09 14:00:54 +13:00
Sylvain Lebresne 69337a4367 Update version for 1.2.0 final 2012-12-29 13:08:23 +01:00
Sylvain Lebresne 2c6b8ee16b Update version to 1.2.0-rc2 2012-12-19 19:24:17 +01:00
Sylvain Lebresne 5a6981eb66 Update version, news and changelog for 1.1.8 2012-12-13 20:59:40 +01:00
Sylvain Lebresne d791e0b3fa Update version for 1.2.0-rc1 release 2012-12-11 09:10:45 +01:00
Sylvain Lebresne b86f75dcd7 Change version to 1.2.0-beta3 2012-12-03 18:36:28 +01:00
Sylvain Lebresne 2f187c9203 Update version in preparation for 1.2.0-rc1 2012-11-30 10:47:35 +01:00
Sylvain Lebresne 2f4b6d8c61 Update version, changes, news and licenses for 1.1.7 release 2012-11-27 09:34:48 +01:00
Sylvain Lebresne 03f8fec8c4 Update slf4j to a modern version 2012-11-09 16:48:31 +01:00
Sylvain Lebresne fdf29594ca Update version and add missing license 2012-11-05 18:41:01 +01:00
Jonathan Ellis 52f3912d42 bump hadoop version to 1.0.3 2012-11-05 10:41:19 -06:00
Brandon Williams c06c276c76 Upgrade to pig 0.10
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4691
2012-10-13 15:15:08 -05:00
Sylvain Lebresne 2773f7cd8b Versions, changes, news for 1.1.6 release 2012-10-09 16:44:15 +02:00
Jake Luciani e05a5fc126 Add support for writing to multiple column families in CFOF
Patch by Robbie Strickland; Reviewed by tjake for CASSANDRA-4208
2012-10-01 20:59:32 +02:00
Jonathan Ellis 0b94b191d8 add PBSPredictor consistency modeler
patch by Peter Bailis and Shivaram Venkataraman; reviewed by jbellis for CASSANDRA-4261
2012-09-27 15:28:25 -05:00
Sylvain Lebresne 373e5b0d51 Update version and news for 1.0.12 2012-09-24 21:42:47 +02:00
Sylvain Lebresne 60bf68caa9 Update version, licenses, etc... for 1.2.0-beta1 release 2012-09-18 18:01:22 +02:00
Jonathan Ellis dd79571f51 Merge branch 'cassandra-1.1' into trunk 2012-09-18 09:57:25 -05:00
Jonathan Ellis e6326e9fd8 increase long-test timeout 2012-09-18 09:57:20 -05:00
Jonathan Ellis 85fc72be86 Merge branch 'cassandra-1.1' into trunk 2012-09-17 11:44:07 -05:00
Jonathan Ellis aa7dafaca4 Add ITransportFactory to cassandra-thrift jar
patch by Sam Tunnicliffe for CASSANDRA-4668
2012-09-17 11:43:00 -05:00
Sylvain Lebresne acaa524655 Update version, news, license, ... for 1.1.5 release 2012-09-06 08:57:57 +02:00
Dave Brosius 978d7bb7d5 fix clientutil.jar dependencies
patch by dbrosius and eevans reviewed by eevans for CASSANDRA-4566
2012-09-05 23:59:31 -04:00
Eric Evans afbbe1abca remove spurious "v" 2012-08-14 18:19:25 -05:00
Eric Evans 8b1336f004 remove spurious character 2012-08-14 16:06:09 -05:00
Jonathan Ellis 1a44fa7ea2 merge from 1.1 2012-08-14 16:01:41 -05:00
Jonathan Ellis 17c1787e94 merge from 1.0 2012-08-14 16:01:17 -05:00
Eric Evans 9dc560812e updated for 1.1.4 release 2012-08-13 15:16:02 -05:00
Sylvain Lebresne d0392208f5 Update news, version and licenses for 1.1.3 release 2012-07-30 18:35:07 +02:00
Sylvain Lebresne 4f0237acd5 Update versions, news and changes for 1.0.11 release 2012-07-27 17:14:32 +02:00
Jonathan Ellis 04a18020e5 upgrade to guava 12
patch by dralves
2012-07-05 19:24:46 -05:00
Sylvain Lebresne 6d3a3eed27 Custom CQL protocol
patch by slebresne; reviewed by yukim and norman for CASSANDRA-2478
2012-07-05 18:21:09 +02:00
Sylvain Lebresne 44e0b9655a Update version and NEWS for 1.1.2 release 2012-06-29 16:59:00 +02:00
Jonathan Ellis c34c70f0bb Merge branch 'cassandra-1.1' into trunk 2012-06-16 10:15:54 -05:00
Jonathan Ellis 6dddf360e0 split out uptodate checks for cql2 and cql3 so they actually work 2012-06-16 10:15:45 -05:00
Dave Brosius 7030d1e233 quell ant runtime warnings while executing target build-test 2012-06-15 20:36:53 -04:00
Vijay Parthasarathy 749522b7f9 Merge branch 'cassandra-1.1' into trunk 2012-06-12 11:41:05 -07:00
Vijay Parthasarathy 5cbdf13790 fix maven dependency version for CLHM 2012-06-12 11:38:40 -07:00
Sylvain Lebresne 682a34f363 Merge branch 'cassandra-1.1' into trunk 2012-06-12 15:05:43 +02:00
Sylvain Lebresne e4ce6b3024 Add CQL3 documentation 2012-06-12 14:59:12 +02:00
Sylvain Lebresne a788a23ca6 Change build version 2012-06-01 19:51:37 +02:00
Brandon Williams 8a2afef95d Merge branch 'cassandra-1.1' into trunk 2012-05-29 17:37:05 -05:00
Brandon Williams 5796542aa4 Fix stress classpath and slf4j warnings.
Patch by Nick Bailey, reviewed by Kirk True for CASSANDRA-4276
2012-05-29 17:36:07 -05:00
Jonathan Ellis 92cf527f8c Merge branch 'cassandra-1.1' into trunk 2012-05-22 10:49:52 -05:00
Jonathan Ellis a1386f96c2 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-05-22 10:49:48 -05:00
Jonathan Ellis f89b9aecc6 fix long-test xml
patch by Tyler Patterson; reviewed by jbellis for CASSANDRA-4270
2012-05-22 10:49:42 -05:00
Vijay Parthasarathy e6cebc89c0 Version of trunk to 1.2 to help new folks 2012-05-09 09:30:03 -07:00
Yuki Morishita f81cc74f5c add serializedSize (part 2) and fix unit tests
patch by yukim; reviewed by jbellis for CASSANDRA-3617
2012-05-08 12:40:55 -05:00
Sylvain Lebresne b2ca7f8212 Change version for 1.0.10 release 2012-05-04 17:53:39 +02:00
Sylvain Lebresne 0f9c391a10 Fix dependency versions in generated pom
patch by stephenc; reviewed by slebresne for CASSANDRA-4183
2012-05-04 15:05:31 +02:00
Brandon Williams 86a775d1eb Merge branch 'cassandra-1.1' into trunk 2012-05-01 13:59:18 -05:00
Brandon Williams 52bd2732cd Merge branch 'cassandra-1.0' into cassandra-1.1 2012-05-01 13:59:12 -05:00
Brandon Williams f4430ff4e7 Change default ant target to jar.
Patch by brandonwilliams reviewed by Ben Coverston for CASSANDRA-4168
2012-05-01 13:58:29 -05:00
Brandon Williams 0471062910 Merge branch 'cassandra-1.1' into trunk 2012-04-27 16:07:35 -05:00
Eric Evans 2af8591bd7 eliminate clientutil dependency on commons-lang
Patch by Dave Brosius; reviewed by eevans for CASSANDRA-3665
2012-04-27 09:44:59 -05:00
Eric Evans a725f80fce eliminate clientutil dependency on commons-lang
Patch by Dave Brosius; reviewed by eevans for CASSANDRA-3665
2012-04-27 09:40:56 -05:00
Jonathan Ellis d94314a143 Merge branch 'cassandra-1.1' into trunk 2012-04-24 13:12:19 -05:00
Sylvain Lebresne 7e8ee1539c Update versions and licence in preparation for 1.1.0 release 2012-04-24 13:11:29 -05:00
Jonathan Ellis 7b3349f6ec Merge branch 'cassandra-1.1' into trunk 2012-04-19 15:54:06 -05:00
Jonathan Ellis 36a9f9bd8f fix NPE in cql3 ALTER TABLE
patch by pcannon; reviewed by jbellis for CASSANDRA-4163
2012-04-19 15:53:53 -05:00
Jonathan Ellis 512946c388 add back tools/bin after merging revert from 1.0 2012-04-18 11:25:08 -05:00
Jonathan Ellis cf98153c65 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-04-18 11:13:11 -05:00
Jonathan Ellis 8c9d0fb72a Revert "allow running stress from build classes" and "Add stress tool to binaries"
This reverts commits cb7a931ffc and 9b746daf7f.
2012-04-18 11:12:29 -05:00
Vijay Parthasarathy 70523977c3 allow running stress from build classes
patch by Vijay; reviewed by jbellis for CASSANDRA-4139
2012-04-16 15:51:38 -07:00
Vijay Parthasarathy 7dc6acafbe allow running stress from build classes
patch by Vijay; reviewed by jbellis for CASSANDRA-4139
2012-04-16 15:51:06 -07:00
Vijay Parthasarathy cb7a931ffc allow running stress from build classes
patch by Vijay; reviewed by jbellis for CASSANDRA-4139
2012-04-16 15:43:53 -07:00
Jonathan Ellis 2914f15a00 Merge branch 'cassandra-1.1' into trunk 2012-04-13 10:35:42 -05:00
Sylvain Lebresne cbbf54910f Update version for 1.1.0 RC1 release 2012-04-12 10:01:18 +02:00
Jonathan Ellis c14e266eb3 merge from 1.0 2012-04-11 09:05:33 -05:00
Vijay Parthasarathy 3f0dae7620 Add stress tool to binaries
patch by Vijay; reviewed by driftx for CASSANDRA-4103
2012-04-09 17:14:05 -07:00
Vijay Parthasarathy 9b746daf7f Add stress tool to binaries
patch by Vijay; reviewed by driftx for CASSANDRA-4103
2012-04-09 17:09:53 -07:00
Pavel Yaskevich 9bdacf7df1 (CLI) jline version is bumped to 1.0 to properly support 'delete' key function
patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-4132
2012-04-10 00:38:52 +03:00
Sylvain Lebresne 83371ebe8f Merge branch 'cassandra-1.0' into cassandra-1.1.0
Conflicts:
	build.xml
2012-04-03 18:07:25 +02:00
Stephen Connolly 062ee3f2ee Update POM generation after migration to git
patch by stephenc; reviewed by slebresne for CASSANDRA-3732
2012-04-03 18:02:03 +02:00
Stephen Connolly 0a969449fb Add snaptree dependency to pom (and fix yammer metrics dependency)
patch by stephenc; reviewed by slebresne for CASSANDRA-3676
2012-04-03 17:35:24 +02:00
Sylvain Lebresne 4457839b9d Update versions and news for 1.0.9 2012-04-02 14:23:50 +02:00
Sylvain Lebresne 643d18af24 Update versions and add missing licenses for beta2 release 2012-03-23 10:37:50 +01:00
Peter Schuller 154daa03a6 expose counters for unavailable/timeout exceptions given to thrift clients
patch by scode; reviewed by driftx, eevans for CASSANDRA-3671
2012-03-05 22:03:32 -08:00
Sylvain Lebresne fe6980eb7d Fix version, licences and changelog for 1.0.8 release 2012-02-22 15:10:56 +01:00
Brandon Williams 42175b6fd0 Upgrade pig to 0.9.2 2012-02-16 12:37:43 -06:00
Sylvain Lebresne 7f4693dab9 Fix licenses and version for 1.1.0-beta1 2012-02-15 16:53:43 +01:00
Jonathan Ellis aa20c7206c merge from 1.0 2012-01-27 22:27:49 -06:00
Eric Evans 32075c4aec test to expose missing dependencies
Patch by eevans; reviewed by Dave Brosius for CASSANDRA-3665
2012-01-27 13:52:33 -06:00
Sylvain Lebresne 655ccc3abf CQL 3.0 beta
patch by slebresne; reviewed by jbellis and urandom for CASSANDRA-3761
2012-01-25 13:34:18 +01:00
Brandon Williams dc7db04517 Move pig to src and examples.
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-3713.
2012-01-24 07:37:00 -06:00
Sylvain Lebresne d10da15526 Fix changelog/news and update version for 1.0.7 release 2012-01-11 09:54:59 +01:00
T Jake Luciani 7c8c57041b Upgrade Thrift to 0.7.0
Patch by jfarrell; reviewed by tjake for CASSANDRA-3213
2012-01-10 15:46:22 -05:00
Eric Evans 8703f745fe -javadoc and -sources jars for clientutil
Patch by satish babu krishnamoorthy w/ minor changes; reviewed by eevans for CASSANDRA-3426
2011-12-29 16:38:24 -06:00
Eric Evans a7db75f498 -javadoc and -sources jars for clientutil
Patch by satish babu krishnamoorthy w/ minor changes; reviewed by eevans for CASSANDRA-3426
2011-12-29 16:35:46 -06:00
Eric Evans ddd9cf752f remove ant builder; restore java builder
Patch by eevans; reviewed by Rick Shaw for CASSANDRA-3632


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1220838 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 16:49:30 +00:00
Eric Evans 90e90a4246 remove ant builder; restore java builder
Patch by eevans; reviewed by tjake for CASSANDRA-3632


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1220817 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 15:58:44 +00:00
Pavel Yaskevich 9b7421ad05 merge from 1.0
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1220672 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 09:33:17 +00:00
Jonathan Ellis e99cd6253b merge from 1.0
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1214927 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 19:34:40 +00:00
Jonathan Ellis 73e4ceb94f prevent rat from pulling down an older version of commons-lang than we ship in lib, which was harmless but confusing
patch by Piotr Koaczkowski; reviewed by jbellis

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1214315 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 16:03:44 +00:00
Brandon Williams 8cf9f2deda Allow overriding RING_DELAY.
Patch by brandonwilliams reviewed by slebresne for CASSANDRA-3600

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1213346 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 18:22:13 +00:00
Sylvain Lebresne 55af99a3d9 Update news and version for 1.0.6 release
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1212944 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 00:24:58 +00:00
Sylvain Lebresne 6cc7d17b3e merge news and debian changelog changes from 1.0.5 branch
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1212941 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 00:09:01 +00:00
Brandon Williams 250e63bc74 Remove old distributed tests.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-3602

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1212572 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 18:45:39 +00:00