git commit: Revert merge from 1.1

Updated Branches: refs/heads/trunk 4c1b11bc3 - f31dbee7d Revert merge from 1.1 This reverts commit 4c1b11bc35ed8770076742ad27e8374418e9970e, reversing changes made to 96a46771b287a265a4d9faf61543163e342f6d87. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: Cleanup strange import fallout from revert

Updated Branches: refs/heads/trunk f31dbee7d - 0ada18462 Cleanup strange import fallout from revert Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ada1846 Tree:

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 ef8620f88 - 686fe1e14 refs/heads/trunk ae6a43c22 - d634f0516 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d634f051 Tree:

[3/3] git commit: Pass pig vars through url params in addition to env vars. Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for CASSANDRA-4499

Pass pig vars through url params in addition to env vars. Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for CASSANDRA-4499 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/686fe1e1 Tree: http://git

[2/3] git commit: Pass pig vars through url params in addition to env vars. Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for CASSANDRA-4499

Pass pig vars through url params in addition to env vars. Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for CASSANDRA-4499 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/686fe1e1 Tree: http://git

git commit: cqlsh: fix display of timeuuids

Updated Branches: refs/heads/trunk 7dee84c34 - f6bb970a4 cqlsh: fix display of timeuuids Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6bb970a Tree:

git commit: cqlsh: alphabetize help Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4034

Updated Branches: refs/heads/cassandra-1.1 ee4a26d86 - 4c4528879 cqlsh: alphabetize help Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4034 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: cqlsh: autocomplete fqdn Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4423

Updated Branches: refs/heads/cassandra-1.1 4c4528879 - d7e4c4a22 cqlsh: autocomplete fqdn Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4423 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: cqlsh: fix extra space in tab completion Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4334

Updated Branches: refs/heads/cassandra-1.1 d7e4c4a22 - 83b6f2229 cqlsh: fix extra space in tab completion Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4334 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk c1724dd8a - 2edeeeba2 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2edeeeba Tree:

[4/4] git commit: cqlsh: alphabetize help Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4034

cqlsh: alphabetize help Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4034 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c452887 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/4] git commit: cqlsh: fix extra space in tab completion Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4334

cqlsh: fix extra space in tab completion Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4334 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83b6f222 Tree: http://git-wip-us.apache.org/repos/asf

[3/4] git commit: cqlsh: autocomplete fqdn Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4423

cqlsh: autocomplete fqdn Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4423 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7e4c4a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

git commit: fix changes formatting

Updated Branches: refs/heads/trunk 7a9ca840a - a5cba7906 fix changes formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5cba790 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5cba790 Diff:

[3/3] git commit: Fix inconsistencies between yaml and code defaults. Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-4754

Fix inconsistencies between yaml and code defaults. Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-4754 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d170a7a9 Tree: http://git-wip-us.apache.org

[2/3] git commit: Fix inconsistencies between yaml and code defaults. Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-4754

Fix inconsistencies between yaml and code defaults. Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-4754 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d170a7a9 Tree: http://git-wip-us.apache.org

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 0e0213b60 - d170a7a99 refs/heads/trunk 7833db260 - dbcf00df8 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/config/Config.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: cqlsh: add thrift transport factory imeplementation Patch by Aleksey Yeschenko, reviewed brandonwilliams

cqlsh: add thrift transport factory imeplementation Patch by Aleksey Yeschenko, reviewed brandonwilliams Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c2922c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 038aa6bca - 780ccc8ba Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/780ccc8b Tree:

[3/3] git commit: cqlsh: add thrift transport factory Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610

cqlsh: add thrift transport factory Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51e4b7ad Tree: http://git-wip-us.apache.org/repos/asf

git commit: cqlsh: add thrift transport factory Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610

Updated Branches: refs/heads/cassandra-1.1 eff4b6866 - 3f31642c3 cqlsh: add thrift transport factory Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/5] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 2773f7cd8 - 9d7fba989 refs/heads/trunk 0bdd152fb - a812998e2 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a812998e Tree:

[2/5] git commit: cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756

cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c44af8c2 Tree: http://git-wip

[3/5] git commit: cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756

cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d7fba98 Tree: http://git-wip

[4/5] git commit: cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756

cqlsh: allow configuration of value display formats Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3756 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d7fba98 Tree: http://git-wip

[5/5] git commit: Versions, changes, news for 1.1.6 release

Versions, changes, news for 1.1.6 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2773f7cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2773f7cd Diff:

git commit: cqlsh: enable tracing Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4584

Updated Branches: refs/heads/trunk 21b7bbe6a - ed6d24e59 cqlsh: enable tracing Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4584 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed6d24e5

git commit: Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789

Updated Branches: refs/heads/trunk 9d58b7158 - 63a5e4ef8 Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789

Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4355aa87 Tree: http://git-wip-us.apache.org/repos

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 178c934aa - 4355aa877 refs/heads/trunk 63a5e4ef8 - 286a175d8 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/286a175d Tree:

[3/3] git commit: Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789

Pig: fix widerow input with single column rows Patch by Will Oberman, reviewed by brandonwilliams for CASSANDRA-4789 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4355aa87 Tree: http://git-wip-us.apache.org/repos

[2/2] git commit: Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749

Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6407cbca Tree: http://git-wip-us.apache.org/repos/asf

[1/2] git commit: merge from 1.1

Updated Branches: refs/heads/trunk 488122136 - e19fa37d4 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e19fa37d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e19fa37d Diff:

git commit: Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749

Updated Branches: refs/heads/cassandra-1.1 936302cb3 - a0900f3d3 Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Upgrade to pig 0.10 Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4691

Updated Branches: refs/heads/trunk f81864eba - c06c276c7 Upgrade to pig 0.10 Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4691 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c06c276c Tree: http://git

[1/6] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 a0900f3d3 - 4d2e5e73b refs/heads/trunk fe5e4aef2 - 7e937b3d1 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e937b3d Tree:

[5/6] git commit: cqlsh: fix copy to/from for cql3 Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4674

cqlsh: fix copy to/from for cql3 Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4674 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/596d54c2 Tree: http://git-wip-us.apache.org/repos/asf

[2/6] git commit: cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597

cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d83cfc2 Tree: http://git-wip

[6/6] git commit: Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749

Pig: fix widerow/secondary env toggles Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0900f3d Tree: http://git-wip-us.apache.org/repos/asf

[3/6] git commit: cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597

cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d2e5e73 Tree: http://git-wip

[4/6] git commit: cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597

cqlsh: use libedit when readline is not available, if possible Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-3597 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d2e5e73 Tree: http://git-wip

git commit: Make SerializingCacheProvider the default when absent from the yaml. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4828

Updated Branches: refs/heads/cassandra-1.1 ffbcb4b11 - c9b249b2a Make SerializingCacheProvider the default when absent from the yaml. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4828 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: cqlsh: support moving CL to the protocol level Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4823

Updated Branches: refs/heads/trunk 0f8351004 - f8129b435 cqlsh: support moving CL to the protocol level Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4823 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

git commit: mv cqlshrc example out of bin

Updated Branches: refs/heads/cassandra-1.1 6f31aba0e - e4fc1ebba mv cqlshrc example out of bin Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4fc1ebb Tree:

[1/3] git commit: Add ssl support to cqlsh. Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610

Updated Branches: refs/heads/trunk 565c57684 - bc4df221e Add ssl support to cqlsh. Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4610 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[3/3] git commit: mv cqlshrc example out of bin

mv cqlshrc example out of bin Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4fc1ebb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4fc1ebb Diff:

[2/3] git commit: Merge branch 'cassandra-1.1' into trunk

Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98effbf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98effbf6 Diff:

[2/3] git commit: cqlsh: fix help topics Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4811

cqlsh: fix help topics Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4811 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77573c59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 e4fc1ebba - 77573c599 refs/heads/trunk c54fe4c41 - e93eacec7 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e93eacec Tree:

[3/3] git commit: cqlsh: fix help topics Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4811

cqlsh: fix help topics Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4811 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77573c59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 77573c599 - 0712c66f5 refs/heads/trunk 14afcc7d7 - 21c57a094 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21c57a09 Tree:

[3/3] git commit: Add log4j reloading to debian init. Patch by brandonwilliams reviewed by Rick Branson for CASSANDRA-4855

Add log4j reloading to debian init. Patch by brandonwilliams reviewed by Rick Branson for CASSANDRA-4855 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0712c66f Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[2/3] git commit: Add log4j reloading to debian init. Patch by brandonwilliams reviewed by Rick Branson for CASSANDRA-4855

Add log4j reloading to debian init. Patch by brandonwilliams reviewed by Rick Branson for CASSANDRA-4855 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0712c66f Tree: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: cqlsh: allow describing system tables Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4863

Updated Branches: refs/heads/trunk f3b636fc2 - 64f3ab270 cqlsh: allow describing system tables Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4863 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[3/3] git commit: cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746

cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afd95c10 Tree: http://git-wip-us.apache.org/repos

[2/3] git commit: cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746

cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d486710 Tree: http://git-wip-us.apache.org/repos

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 64f3ab270 - 213d25c99 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213d25c9 Tree:

git commit: cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746

Updated Branches: refs/heads/cassandra-1.1 a2a2251b3 - d51643cad cqlsh: fix timestamp formatting for tz info Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4746 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

svn commit: r1073894 - in /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress: ./ operations/ util/

Author: brandonwilliams Date: Wed Feb 23 19:25:40 2011 New Revision: 1073894 URL: http://svn.apache.org/viewvc?rev=1073894view=rev Log: Switch stress.java to a producer/consumer model for better performance. Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-2020 Removed

svn commit: r1074229 - /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java

Author: brandonwilliams Date: Thu Feb 24 17:37:28 2011 New Revision: 1074229 URL: http://svn.apache.org/viewvc?rev=1074229view=rev Log: Add missed file from 2020 Added: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java (with props

svn commit: r1074291 - in /cassandra/branches/cassandra-0.7: src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/tools/ src/java/org/apache/cassandra/utils/ test/unit/org/apache/cassandra/

Author: brandonwilliams Date: Thu Feb 24 21:15:22 2011 New Revision: 1074291 URL: http://svn.apache.org/viewvc?rev=1074291view=rev Log: Cleanup and document EstimatedHistogram Patch by jbellis, reviewed by brandonwilliams for CASSANDRA-2232 Modified: cassandra/branches/cassandra-0.7/src

svn commit: r1075371 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java

Author: brandonwilliams Date: Mon Feb 28 15:16:59 2011 New Revision: 1075371 URL: http://svn.apache.org/viewvc?rev=1075371view=rev Log: Modernize nodecmd option handling. Patch by Pavel Yaskevich, reviewed by Sylvain Lebresne for CASSANDRA-2219 Modified: cassandra/branches/cassandra-0.7/src

svn commit: r1075409 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools: NodeCmd.java NodeProbe.java

Author: brandonwilliams Date: Mon Feb 28 16:25:06 2011 New Revision: 1075409 URL: http://svn.apache.org/viewvc?rev=1075409view=rev Log: Add join command to nodetool Patch by Pavel Yaskevich, reviewed by Sylvain Lebresne for CASSANDRA-2160 Modified: cassandra/branches/cassandra-0.7/src/java

svn commit: r1075543 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java

Author: brandonwilliams Date: Mon Feb 28 21:32:08 2011 New Revision: 1075543 URL: http://svn.apache.org/viewvc?rev=1075543view=rev Log: CFRW no longer loses mutations. Patch by Eldon Stegall, reviewed by Stu Hood and brandonwilliams for CASSANDRA-2255 Modified: cassandra/branches/cassandra

svn commit: r1076699 - in /cassandra/branches/cassandra-0.7: src/java/org/apache/cassandra/db/ColumnFamilyStore.java test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java

Author: brandonwilliams Date: Thu Mar 3 17:40:59 2011 New Revision: 1076699 URL: http://svn.apache.org/viewvc?rev=1076699view=rev Log: CFS correctly flushes index CFs. Patch by jbellis, reviewed by brandonwilliams for CASSANDRA-2244 Modified: cassandra/branches/cassandra-0.7/src/java/org

svn commit: r1076700 - /cassandra/branches/cassandra-0.7/CHANGES.txt

Author: brandonwilliams Date: Thu Mar 3 17:42:16 2011 New Revision: 1076700 URL: http://svn.apache.org/viewvc?rev=1076700view=rev Log: update CHANGES Modified: cassandra/branches/cassandra-0.7/CHANGES.txt Modified: cassandra/branches/cassandra-0.7/CHANGES.txt URL: http://svn.apache.org

svn commit: r1076905 - in /cassandra/branches/cassandra-0.7: CHANGES.txt contrib/pig/README.txt contrib/pig/bin/pig_cassandra contrib/pig/build.xml contrib/pig/src/java/org/apache/cassandra/hadoop/pig

Author: brandonwilliams Date: Fri Mar 4 00:41:55 2011 New Revision: 1076905 URL: http://svn.apache.org/viewvc?rev=1076905view=rev Log: Pig storefunc. Patch by brandonwilliams, reviewed by Jeremy Hanna for CASSANDRA-1828. Modified: cassandra/branches/cassandra-0.7/CHANGES.txt cassandra

svn commit: r1078069 - in /cassandra/trunk: ./ conf/ contrib/ contrib/pig/ contrib/pig/bin/ contrib/pig/src/java/org/apache/cassandra/hadoop/pig/ interface/thrift/gen-java/org/apache/cassandra/thrift/

Author: brandonwilliams Date: Fri Mar 4 17:46:20 2011 New Revision: 1078069 URL: http://svn.apache.org/viewvc?rev=1078069view=rev Log: Merge from 0.7 Modified: cassandra/trunk/ (props changed) cassandra/trunk/CHANGES.txt cassandra/trunk/conf/cassandra.yaml cassandra/trunk

svn commit: r1078074 - /cassandra/trunk/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Author: brandonwilliams Date: Fri Mar 4 17:53:30 2011 New Revision: 1078074 URL: http://svn.apache.org/viewvc?rev=1078074view=rev Log: Fix pig merge. Modified: cassandra/trunk/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Modified: cassandra/trunk/contrib/pig

svn commit: r1078108 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java

Author: brandonwilliams Date: Fri Mar 4 19:22:37 2011 New Revision: 1078108 URL: http://svn.apache.org/viewvc?rev=1078108view=rev Log: Fix NPE in nodetool when gossip isn't initialized. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2270 Modified: cassandra/branches/cassandra

svn commit: r1078118 - /cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java

Author: brandonwilliams Date: Fri Mar 4 20:31:27 2011 New Revision: 1078118 URL: http://svn.apache.org/viewvc?rev=1078118view=rev Log: Change nodetool default port to match new default. Patch by brandonwilliams Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java

svn commit: r1078200 - in /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress: operations/IndexedRangeSlicer.java operations/Inserter.java util/Operation.java

Author: brandonwilliams Date: Fri Mar 4 23:08:48 2011 New Revision: 1078200 URL: http://svn.apache.org/viewvc?rev=1078200view=rev Log: Generate column values of average rather than specific size. Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-2266 Modified: cassandra

svn commit: r1079525 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

Author: brandonwilliams Date: Tue Mar 8 20:40:12 2011 New Revision: 1079525 URL: http://svn.apache.org/viewvc?rev=1079525view=rev Log: Notify subscribers that the node was dead if it restarts before we mark it down. Patch slebresne, reviewed by brandonwilliams for CASSANDRA-2292 Modified

svn commit: r1079547 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/gms/

Author: brandonwilliams Date: Tue Mar 8 21:18:19 2011 New Revision: 1079547 URL: http://svn.apache.org/viewvc?rev=1079547view=rev Log: Merge from 0.7 Modified: cassandra/trunk/ (props changed) cassandra/trunk/contrib/ (props changed) cassandra/trunk/interface/thrift/gen-java

svn commit: r1080090 - in /cassandra/branches/cassandra-0.7/contrib/pig: bin/pig_cassandra build.xml

Author: brandonwilliams Date: Thu Mar 10 01:10:07 2011 New Revision: 1080090 URL: http://svn.apache.org/viewvc?rev=1080090view=rev Log: Rename pig jar from loadfunc to storage to reflect it supports both reading and writing. Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-2303

svn commit: r1080790 - /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java

Author: brandonwilliams Date: Fri Mar 11 23:13:19 2011 New Revision: 1080790 URL: http://svn.apache.org/viewvc?rev=1080790view=rev Log: Fix stress.java build Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java

svn commit: r1080806 - /cassandra/branches/cassandra-0.7/conf/cassandra.yaml

Author: brandonwilliams Date: Fri Mar 11 23:55:08 2011 New Revision: 1080806 URL: http://svn.apache.org/viewvc?rev=1080806view=rev Log: Remove binary_memtable_throughput_in_mb from yaml to avoid confusion Modified: cassandra/branches/cassandra-0.7/conf/cassandra.yaml Modified: cassandra

svn commit: r1081859 - /cassandra/branches/cassandra-0.7/conf/cassandra-topology.properties

Author: brandonwilliams Date: Tue Mar 15 17:06:24 2011 New Revision: 1081859 URL: http://svn.apache.org/viewvc?rev=1081859view=rev Log: Add comments to topology file about ipv6 configuration. Patch by Eric Tamme, reviewed by brandonwilliams for CASSANDRA-2329 Modified: cassandra/branches

svn commit: r1081867 - in /cassandra/branches/cassandra-0.7: ./ src/java/org/apache/cassandra/hadoop/

Author: brandonwilliams Date: Tue Mar 15 17:22:45 2011 New Revision: 1081867 URL: http://svn.apache.org/viewvc?rev=1081867view=rev Log: Allow Hadoop jobs to set the consistency level. Patch by Eldon Stegall, reviewed by brandonwilliams for CASSANDRA-2331 Modified: cassandra/branches

svn commit: r1081876 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Author: brandonwilliams Date: Tue Mar 15 17:36:21 2011 New Revision: 1081876 URL: http://svn.apache.org/viewvc?rev=1081876view=rev Log: Queue secondary indexes for flush before the parent. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2330 Modified: cassandra/branches/cassandra

svn commit: r1082034 - in /cassandra/trunk: build.xml drivers/txpy/ drivers/txpy/README drivers/txpy/example.py drivers/txpy/setup.py drivers/txpy/txcql/ drivers/txpy/txcql/__init__.py drivers/txpy/tx

Author: brandonwilliams Date: Wed Mar 16 03:05:21 2011 New Revision: 1082034 URL: http://svn.apache.org/viewvc?rev=1082034view=rev Log: Twisted driver for CQL Patch by brandonwilliams, reviewed by eevans for CASSANDRA-2022 Added: cassandra/trunk/drivers/txpy/ cassandra/trunk/drivers/txpy

svn commit: r1082236 - in /cassandra/trunk/src/java/org/apache/cassandra: config/ db/ io/sstable/ service/

Author: brandonwilliams Date: Wed Mar 16 17:52:53 2011 New Revision: 1082236 URL: http://svn.apache.org/viewvc?rev=1082236view=rev Log: Refactor row/key cache handling. Patch by slebresne, reviewed by Matthew Dennis for CASSANDRA-2272 Removed: cassandra/trunk/src/java/org/apache/cassandra/io

svn commit: r1082254 - in /cassandra/trunk/src/java/org/apache/cassandra/cache: AutoSavingCache.java AutoSavingKeyCache.java AutoSavingRowCache.java

Author: brandonwilliams Date: Wed Mar 16 18:37:19 2011 New Revision: 1082254 URL: http://svn.apache.org/viewvc?rev=1082254view=rev Log: Forgotten files from 2272 Added: cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java (with props) cassandra/trunk/src/java/org

svn commit: r1082388 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Author: brandonwilliams Date: Thu Mar 17 02:58:45 2011 New Revision: 1082388 URL: http://svn.apache.org/viewvc?rev=1082388view=rev Log: Allow configured ports and initial token to be overridden by system properties. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2343 Modified

svn commit: r1083982 - in /cassandra/branches/cassandra-0.7: contrib/pig/README.txt contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java src/java/org/apache/cassandra/hadoop/Conf

Author: brandonwilliams Date: Mon Mar 21 21:58:45 2011 New Revision: 1083982 URL: http://svn.apache.org/viewvc?rev=1083982view=rev Log: Allow specifying a slice predicate for Pig queries Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-1618 Modified: cassandra/branches/cassandra

svn commit: r1084028 - in /cassandra/branches/cassandra-0.7: src/java/org/apache/cassandra/cache/ src/java/org/apache/cassandra/db/ test/unit/org/apache/cassandra/ test/unit/org/apache/cassandra/db/

Author: brandonwilliams Date: Mon Mar 21 23:56:35 2011 New Revision: 1084028 URL: http://svn.apache.org/viewvc?rev=1084028view=rev Log: add cache loading to row/key cache tests. Patch by Pavel Yaskevich and Matthew Dennis, reviewed by Pavel Yaskevich for CASSANDRA-2227 Modified: cassandra

svn commit: r1084616 - in /cassandra/trunk: src/java/org/apache/cassandra/cli/ test/unit/org/apache/cassandra/cli/

Author: brandonwilliams Date: Wed Mar 23 15:41:21 2011 New Revision: 1084616 URL: http://svn.apache.org/viewvc?rev=1084616view=rev Log: Add counter support to the cli. Patch by Sylvain Lebresne, reviewed by Pavel Yaskevich for CASSANDRA-2341. Modified: cassandra/trunk/src/java/org/apache

svn commit: r1084765 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java

Author: brandonwilliams Date: Wed Mar 23 21:46:58 2011 New Revision: 1084765 URL: http://svn.apache.org/viewvc?rev=1084765view=rev Log: Show units on 'show keyspaces' cli output. Patch by Pavek Yaskevich, reviewed by Jon Hermes for CASSANDRA-2345 Modified: cassandra/branches/cassandra-0.7

svn commit: r1085074 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java

Author: brandonwilliams Date: Thu Mar 24 18:59:31 2011 New Revision: 1085074 URL: http://svn.apache.org/viewvc?rev=1085074view=rev Log: Log a message when a streaming action for an unkown session is received instead of NPE. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2377

svn commit: r1087008 - /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java

Author: brandonwilliams Date: Wed Mar 30 16:18:39 2011 New Revision: 1087008 URL: http://svn.apache.org/viewvc?rev=1087008view=rev Log: stress.java rejects arbitrary arguments. Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-2323 Modified: cassandra/branches/cassandra

svn commit: r1088800 - in /cassandra/branches/cassandra-0.7: contrib/pig/src/java/org/apache/cassandra/hadoop/pig/ src/java/org/apache/cassandra/db/marshal/ src/java/org/apache/cassandra/utils/

Author: brandonwilliams Date: Mon Apr 4 21:53:09 2011 New Revision: 1088800 URL: http://svn.apache.org/viewvc?rev=1088800view=rev Log: Pig uses schema information to cast to/from native types. Patch by Jeremy Hanna and brandonwilliams, reviewed by brandonwilliams for CASSANDRA-2387 Modified

svn commit: r1088835 - /cassandra/branches/cassandra-0.7/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Author: brandonwilliams Date: Tue Apr 5 00:34:56 2011 New Revision: 1088835 URL: http://svn.apache.org/viewvc?rev=1088835view=rev Log: Namepsace the udf context key to avoid accidental overwrites in the future Modified: cassandra/branches/cassandra-0.7/contrib/pig/src/java/org/apache

svn commit: r1089261 - /cassandra/branches/cassandra-0.7/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Author: brandonwilliams Date: Tue Apr 5 22:00:00 2011 New Revision: 1089261 URL: http://svn.apache.org/viewvc?rev=1089261view=rev Log: Optimize schema fetch/store. Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-2421 Modified: cassandra/branches/cassandra-0.7/contrib/pig

svn commit: r1089542 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java

Author: brandonwilliams Date: Wed Apr 6 17:35:20 2011 New Revision: 1089542 URL: http://svn.apache.org/viewvc?rev=1089542view=rev Log: fix FBU.getInstance Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Modified: cassandra/branches

svn commit: r1091857 - /cassandra/branches/cassandra-0.7/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Author: brandonwilliams Date: Wed Apr 13 17:42:15 2011 New Revision: 1091857 URL: http://svn.apache.org/viewvc?rev=1091857view=rev Log: Allow pig to use multiple schemas, fix BytesTypes cast during storage. Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-2465 Modified

svn commit: r1091911 - in /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress: Session.java operations/IndexedRangeSlicer.java util/Operation.java

Author: brandonwilliams Date: Wed Apr 13 20:36:41 2011 New Revision: 1091911 URL: http://svn.apache.org/viewvc?rev=1091911view=rev Log: Use old value generation behavior by default in stress.java to allow indexed range slices to work. Patch by Pavel Yaskevich, reviewed by brandonwilliams

svn commit: r1094195 - /cassandra/branches/cassandra-0.7/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Author: brandonwilliams Date: Sun Apr 17 21:11:26 2011 New Revision: 1094195 URL: http://svn.apache.org/viewvc?rev=1094195view=rev Log: Remove LoadPushDown methods from pig storage. Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-2484 Modified: cassandra/branches/cassandra

svn commit: r1094694 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

Author: brandonwilliams Date: Mon Apr 18 18:57:23 2011 New Revision: 1094694 URL: http://svn.apache.org/viewvc?rev=1094694view=rev Log: Revert Keep endpoint state until aVeryLongTime when not a fat client This reverts commit db9164ffd96ebc7752fc5789c90c7211ba323ad2. For CASSANDRA-2371

svn commit: r1096930 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java

Author: brandonwilliams Date: Tue Apr 26 22:12:36 2011 New Revision: 1096930 URL: http://svn.apache.org/viewvc?rev=1096930view=rev Log: Mark nodes that were previously down as alive, even without a major state change. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2565 Modified

svn commit: r1097668 - in /cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations: IndexedRangeSlicer.java Inserter.java

Author: brandonwilliams Date: Fri Apr 29 01:38:40 2011 New Revision: 1097668 URL: http://svn.apache.org/viewvc?rev=1097668view=rev Log: cache generateValues in Inserter/IndexedRangeSlicer. Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-2578 Modified: cassandra/branches

<    1   2   3   4   5   6   7   8   9   10   >