Commit Graph

7554 Commits

Author SHA1 Message Date
Pavel Yaskevich a0d7d9713d adopt RM code of CASSANDRA-4698 to trunk 2012-09-27 17:35:05 +03:00
Jonathan Ellis 5df3f13b6c merge from 1.1 2012-09-27 09:30:28 -05:00
Jonathan Ellis 93bd3d896f NTS will default unconfigured DC replicas to zero
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4675
2012-09-27 09:29:20 -05:00
Pavel Yaskevich 988ea81d40 fix re-created keyspace disappering after 1.1.5 upgrade
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4698
2012-09-27 17:16:55 +03:00
Dave Brosius 1078e6f514 Avoid ConcurrentModificationExceptions on relocateTokens
patch by dbrosius reviewed by jbellis for CASSANDRA-4727
2012-09-27 08:07:43 -04:00
Sylvain Lebresne c7c396d2bc Fix error message formatting 2012-09-27 11:08:22 +02:00
Sylvain Lebresne c74a871e7a Fix bug starting C* with simple authentication
patch by slebresne; reviewed by jbellis for CASSANDRA-4648
2012-09-27 11:02:03 +02:00
Jonathan Ellis 822ee88a38 fix bit arithmetic to rebuild timestamp; see #2858 2012-09-26 16:34:48 -05:00
Jonathan Ellis cc68336cac clean up IOException usage 2012-09-26 13:22:35 -05:00
Jonathan Ellis b781ee7d52 r/m unused checked exception 2012-09-26 12:54:59 -05:00
Sylvain Lebresne 16f3d33f33 Fix variable visibility issue 2012-09-26 17:29:22 +02:00
Brandon Williams 2edeeeba2d Merge branch 'cassandra-1.1' into trunk 2012-09-26 10:08:32 -05:00
Jonathan Ellis e752de96f7 fix listEndpointsPendingHints to generate String representation of the tokens for which we have hints 2012-09-26 10:05:50 -05:00
Jonathan Ellis c1724dd8a2 merge from 1.1 2012-09-26 10:05:25 -05:00
Brandon Williams 83b6f2229a cqlsh: fix extra space in tab completion
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4334
2012-09-26 10:04:56 -05:00
Jonathan Ellis b03ae12cb5 fix listEndpointsPendingHints to generate String representation of the tokens for which we have hints 2012-09-26 10:03:57 -05:00
Brandon Williams d7e4c4a22a cqlsh: autocomplete fqdn
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4423
2012-09-26 10:02:33 -05:00
Brandon Williams 4c45288790 cqlsh: alphabetize help
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4034
2012-09-26 09:59:55 -05:00
Sylvain Lebresne 981aa0578f Fix ColumnFamilyStoreTest failure 2012-09-26 16:49:07 +02:00
Sylvain Lebresne 9c88ad16a6 Fix validation for IN queries with non-PK cols
patch by slebresne; reviewed by jbellis for CASSANDRA-4709
2012-09-26 16:08:49 +02:00
Sylvain Lebresne ee4a26d865 Fix validation for IN queries with non-PK cols
patch by slebresne; reviewed by jbellis for CASSANDRA-4709
2012-09-26 14:13:14 +02:00
Sylvain Lebresne 0dda10d765 Fix validation when using counter and regular columns in the same table
patch by slebresne; reviewed by jbellis for CASSANDRA-4706
2012-09-26 14:09:48 +02:00
Sylvain Lebresne 2d76556742 Fix scrubbing of CQL3 create tables
patch by slebresne; reviewed by jbellis for CASSANDRA-4685
2012-09-26 14:06:37 +02:00
Sylvain Lebresne ccca5f1e39 Make prepared statement global instead of per-connection
patch by slebresne; reviewed by jbellis for CASSANDRA-4449
2012-09-26 14:05:09 +02:00
Brandon Williams f6bb970a49 cqlsh: fix display of timeuuids 2012-09-25 17:38:08 -05:00
Jonathan Ellis 7dee84c34e Merge branch 'cassandra-1.1' into trunk 2012-09-25 16:50:36 -05:00
Jonathan Ellis 05a5ede91a amend error messages to include possibility of invalid characters
patch by jbellis for CASSANDRA-4721
2012-09-25 16:50:27 -05:00
Jonathan Ellis 5c16120170 rename 2012-09-25 16:41:04 -05:00
Jonathan Ellis 9df0ed97c6 optimize single-row PK lookups
patch by Daniel Norberg; reviewed by jbellis for CASSANDRA-4710
2012-09-25 16:40:24 -05:00
Sylvain Lebresne 2a0389ee08 Stop accepting CQL version 3.0.0-beta1 (in favor of 3.0.0)
patch by slebresne; reviewed by pcannon for CASSANDRA-4649
2012-09-25 14:37:33 +02:00
Jonathan Ellis f177d8e59a Merge branch 'cassandra-1.1' into trunk 2012-09-24 15:36:44 -05:00
Jonathan Ellis b961986a7b CHANGES 2012-09-24 15:26:24 -05:00
Jonathan Ellis 356e8ab5e6 merge from 1.1 2012-09-24 12:44:23 -05:00
Jonathan Ellis 0307dca20d use default consistency level in counter validation if none is explicitly provided
patch by Nitesh Kumar; reviewed by jbellis for CASSANDRA-4700
2012-09-24 12:43:26 -05:00
Jonathan Ellis 0952496156 Merge branch 'cassandra-1.1' into trunk 2012-09-24 10:47:21 -05:00
Jonathan Ellis 6fc4b3a64f Merge branch 'cassandra-1.0' into cassandra-1.1 2012-09-24 10:47:11 -05:00
Jonathan Ellis 4f51c70e12 fix CHANGES for #4708 2012-09-24 10:46:25 -05:00
Jonathan Ellis cad32377d7 Switch from NBHM to CHM in MessagingService's callback map
patch by Daniel Norberg; reviewed by jbellis for CASSANDRA-4708
2012-09-24 10:45:36 -05:00
Jonathan Ellis cc2ced82b6 Merge branch 'cassandra-1.1' into trunk 2012-09-24 10:43:44 -05:00
Jonathan Ellis 789aab11e3 merge from 1.0 2012-09-24 10:43:33 -05:00
Jonathan Ellis 103d9fba48 Switch from NBHM to CHM in MessagingService's callback map
patch by Daniel Norberg; reviewed by jbellis for CASSANDRA-4708
2012-09-24 10:42:14 -05:00
Jonathan Ellis 8fbbdf07a0 Merge branch 'cassandra-1.1' into trunk 2012-09-24 10:09:05 -05:00
Jonathan Ellis db45670a3e Switch from NBHM to CHM in MessagingService's callback map
patch by Daniel Norberg; reviewed by jbellis for CASSANDRA-4708
2012-09-24 10:08:48 -05:00
Jonathan Ellis fa9bbf7e19 fix build 2012-09-22 15:18:54 -05:00
Jonathan Ellis fe5fa0e81b update error messages for setX to setInputX change
patch by Philip Crotwell; reviewed by jbellis for CASSANDRA-4688
2012-09-22 15:16:11 -05:00
Brandon Williams d634f05161 Merge branch 'cassandra-1.1' into trunk 2012-09-21 15:15:17 -05:00
Brandon Williams 686fe1e145 Pass pig vars through url params in addition to env vars.
Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for
CASSANDRA-4499
2012-09-21 14:58:36 -05:00
Jonathan Ellis ae6a43c227 Merge branch 'cassandra-1.1' into trunk 2012-09-21 11:32:31 -05:00
Jonathan Ellis ef8620f883 switch out Arrays.asList.toString for Arrays.toString
patch by yukim; reviewed by jbellis for CASSANDRA-4697
2012-09-21 11:32:23 -05:00
Jonathan Ellis dc97a8ff52 adjust blockFor calculation to account for pending ranges due to node movement
patch by jbellis and slebresne for CASSANDRA-833
2012-09-21 10:11:29 -05:00